Hotm bug fix