fix cloning