fix some code to fit the design
solve issue: another request will interrupt previous one.