Fix for WaitCondition timeout