Properly check for async events related to capture
Merge pull request #1245 from scottgonzalez/async-capture

Properly check for async events related to capture