Fixing topic_controller bug