fixing cloning issue