Fixed a client dependency on the server side.