Issue #21628: Fixing currency issues