wait check was implement wrong