Fix for async responses