am 32271c3d: Tweak calculation for number of columns and rows

* commit '32271c3d20939d4fa02d4c84e1d95cefd5c183fd':
  Tweak calculation for number of columns and rows