Fixed CLIENT / SERVER switch (accidentally included in commit)