improved wait method for hoster