Restored async support
Minor