broker-service handler dirty code fix