fix cloning issues