Fixing atom cloning.