fixed hs-002 and hs-017