Really small broker patch