#642 cloning fixed.