clone bug fix