Added sameTopicComments fix