Fix issue where rows increment incorrectly when a rowspan property exists