Clone() bug fix