Fix re-use of currency lookup