hs bug fix