Fix to server