Newest fix for CurrencyCode