Fix swapped columns