Fix #984 without breaking topic input