Fix/currencyorder