Fixing broker extended