fix columns reordering