client request and response fix 1