fix in response handler