Overall hs bugfix