Fix for new server code