Fix for servers