Created a helper to address the '1 comments -> 1 comment' problem