Fixing minor issue that was not behave appropriate  in the WebClient