Fix response issue