diff --git a/Core/Game/World/World.cpp b/Core/Game/World/World.cpp
index fe282a9..eaf344c 100644
--- a/Core/Game/World/World.cpp
+++ b/Core/Game/World/World.cpp
@@ -61,7 +61,7 @@ void World::load(std::shared_ptr<SaveMap> save)
 void World::DestroyActor(std::weak_ptr<Actor> ptr)
 {
     std::shared_ptr<Actor> actor = ptr.lock();
-    if (actor.get() == nullptr)
+    if (actor == nullptr)
         return;
     
     std::string name = actor->GetName();
diff --git a/Core/Game/World/World.hpp b/Core/Game/World/World.hpp
index f452e06..029736a 100644
--- a/Core/Game/World/World.hpp
+++ b/Core/Game/World/World.hpp
@@ -31,10 +31,10 @@ public:
     void load(std::shared_ptr<SaveMap> save) override;
 #pragma endregion
     
-    template<class T>
-    std::vector<std::weak_ptr<T>> GetActorsByClass()
+    template<class T, class Container = std::vector<std::weak_ptr<T>>>
+    Container GetActorsByClass()
     {
-        std::vector<std::weak_ptr<T>> list;
+        Container list;
         for (auto i = actors_map.cbegin(); i != actors_map.cend(); ++i)
         {
             if (RTTI::dyn_cast<T, Actor>(i->second.get()))