Fix for server