Ah, oops, I forgot a line in TopicList when resolving the merge conflict. ):