Fixed bug with rows