Fix waiter scoping reset
Merge pull request #217 from passy/waiter-fix

Fix async waiter race condition