fix column ordering