Fixed issue with cloning.