Fixed a bug in Client