remove useless code
Make Conditon more precise

Prevent multiple waits slipping by on one notify