Fixes a bug where singletons are duplicated across clone operations