Fixed the cloning issue