attempt to fix cloning issues