Fixing bug with broker and market type.