Fixed up clone issue