Merge pull request #3306 from kumpera/fix_wait