- Fixed bug in client class