Fix multicurrency issue