Fix HSI more properly