Fix wrong response handling

Fix wrong response handling

Fix wrong response handling