Fixing the Client hashCode implementation