fix the column ordering issue