Fixing response handling.