bug fix in the broker