support non structued clone. Fixes #638