1 files changed, 6 insertions, 2 deletions
diff --git a/lib/collection.h b/lib/collection.h
index e68a8db..329b681 100644
--- a/lib/collection.h
+++ b/lib/collection.h
@@ -18,6 +18,10 @@ public:
 	operator=(Objects && other)
 	{
 		objects = std::move(other);
+		((std::get<OtherObjects<Others>>(otherObjects).clear()), ...);
+		for (const auto & other : objects) {
+			addOthersPtr(other.get());
+		}
 		return *this;
 	}
 
@@ -138,10 +142,10 @@ public:
 		return objects.empty();
 	}
 
-	auto
+	decltype(auto)
 	emplace(Ptr && ptr)
 	{
-		auto object = objects.emplace_back(std::move(ptr));
+		const auto & object = objects.emplace_back(std::move(ptr));
 		addOthersPtr(object.get());
 		return object;
 	}