v1.0.0.25 - fix cloning issues