Issues/2517 update comment count

Closes #2517