One more fix for deep clone