Fixed cloning issue