Fixed a cloning issue