Fix for async