Fix broken server optimization