Trader fix #1