Fix wrong response handling