Hard fix (12/31)

Hard fix