Row bug solved properly