Proper cloning to fix peter/henry confusion