Fix issue with cloning..