Final fix for comment count issues