Fixed bug with topic