Fix to support multi-currenc orgs