[BUGFIX] Fix bug with comment count