Fix to row/col swap