[SupplySwap] Fixed