Switch order for 4.4