Removed if for async. responses