Fix async

ping @jhkchan

Will this fix your use case? Can you try it before I merge and tag please?