Fixing Trade Setup problem