Fixing col order (final fix) see BT#6994