UAT-217/187/188 Small fix for certain cases of row/col length