Fixed for new server