Fixed Winner mode discrepancy with Trader. Refactoring.