One more fix for Client *facepalm*