Fixed empty topic issue