Fix/currencyord