Hard fix (6/31)

Hard fix