should prevent cyclic wait-notify
Merge pull request #3520 from gurbuzali/cyclic-fix/master

should prevent cyclic wait-notify