Fixed cloning issues with null currencies