Bug fix for hand wait check