Fixed TopicBuilder parsing yet again