fix cloning stuff