bugfix with NoWaitTest