fixed response handling