fix the cloning