Fixed hs bug