Bugfix for waitTime - again