introducing fix for multiple brokers