fixed bug with trade reporting
merge