Merge pull request #507 from Icenium/vladimirov/fix-remote-emulator

Add correct waits in dispatcher