GREEN TEAM: more broker fix
Merge pull request #102 from xando/master

GREEN TEAM: broker fix