Fixed deep clone issue