Fixed a remove cloning issue