Fixed new-old ordering