Fixing topic creation logic