second step to bugfix without broadcaster