fixed cloning issue