Bug fixes for currency conversion
Version for 1.9.5