Little fix, topics where crashing everything!!!