Fixed issue with the Client