Deep clone fix