quick merge fix on client.cpp