Fixing conversion rate calculation