Try to fix the async support