Hard fix (5/31)

Hard fix