Fix handle response