Fix for servers.

Finally!!!