Fix for Async APIs