Fix the ordering