#HOT-3 fixed