Fix bug with row count and comments