Fix issue with whitespace not being handled by the client.