Fixed a client/server issue