Another fix in the row count