first step to bugfix without broadcaster