Get ordering correct