Fix response mapping