Fixing cloning issue