FixTopicsFinal for production