Fix /hs waiting