client request and response fix 2