fixing TradingInstrument too