fix waiting