Fix broker.id mess