Update to fix duplicate topics