Fixed deepclone issue