fix #154

* fix #154
* move the duplicated code to the `parseRow` method.