Fix malformed topic stuff