[TMPL-38] Further fix for currency conversion issue