Fixed an issue in implementation of #369
Column and row logic were mixed at one location
Authored by: numere 2018-08-30
Parent: [r386]
Child: [r388]
