fixed cloning issues