Fix order of columns