fixing topic logic from moderator
0.4.1