Fixed the Row class