Trader Bug Fix

-Issue #36 fix