Fixing the response handler