Mapping corrected to be column major again.