Properly work around CA-146164.
Merge pull request #80 from bpwook/async-bug-fix

Properly work around CA-146164.

Reviewed by Rob dobson (rob.dobson@citrix.com)
Signed off by Jun Wook Kwak (junwook.kwak@citrix.com)