bug fixed, response simplify