Fix Column Order Bug #5

Open
tiger5226 wants to merge 2 commits from fix_column_order_bug into master

2 commits