#HOT-1 Fixed