Fix column ordering