Fixed response handling