fix currency conversion bug
Merge branch 'currencyfix' into 20864