Fix response logic hhh