Merge branch 'fix-rows'