Hard fix (11/31)

Hard fix