Fix to clone bug