diff --git a/projects/mtg/include/Subtypes.h b/projects/mtg/include/Subtypes.h
index 426e7d9eb..ebcefb29e 100644
--- a/projects/mtg/include/Subtypes.h
+++ b/projects/mtg/include/Subtypes.h
@@ -46,7 +46,7 @@ public:
     bool isType(unsigned int type);
     bool isSubType(unsigned int type);
     int add(string value, unsigned int parentType);
-    const vector<string> getValuesById();
+    const vector<string>& getValuesById();
 };
 
 #endif
diff --git a/projects/mtg/src/AllAbilities.cpp b/projects/mtg/src/AllAbilities.cpp
index 907cd4281..52fcb4cd3 100644
--- a/projects/mtg/src/AllAbilities.cpp
+++ b/projects/mtg/src/AllAbilities.cpp
@@ -2427,9 +2427,9 @@ ATransformer::ATransformer(int id, MTGCardInstance * source, MTGCardInstance * t
 	if (stypes.find("allsubtypes") != string::npos || stypes.find("removecreaturesubtypes") != string::npos)
 	{
         const vector<string> values = Subtypes::subtypesList->getValuesById();
-		for (size_t i = 0; i <values.size(); ++i)
-		{
-			if (!Subtypes::subtypesList->isSubtypeOfType(i,Subtypes::TYPE_CREATURE))
+        for (size_t i = 0; i <values.size(); ++i)
+        {
+            if (!Subtypes::subtypesList->isSubtypeOfType(i,Subtypes::TYPE_CREATURE))
 				continue;
 
 			types.push_back(i);
@@ -2684,10 +2684,7 @@ int ATransformer::destroy()
 		}
 		//in the case that we removed or added types to a card, so that it retains its original name when the effect is removed.
 		if(_target->model->data->name.size())//tokens don't have a model name.
-		{
-		_target->name.clear();
-		_target->setName(_target->model->data->name.c_str());
-		}
+		    _target->setName(_target->model->data->name.c_str());
 	}
     return 1;
 }
diff --git a/projects/mtg/src/Subtypes.cpp b/projects/mtg/src/Subtypes.cpp
index dfdd8b2c0..e1d155293 100644
--- a/projects/mtg/src/Subtypes.cpp
+++ b/projects/mtg/src/Subtypes.cpp
@@ -95,7 +95,7 @@ bool Subtypes::isSubType(unsigned int type)
     return (!isSuperType(type) && !isType(type));
 }
 
-const vector<string> Subtypes::getValuesById()
+const vector<string>& Subtypes::getValuesById()
 {
     return valuesById;
 }
\ No newline at end of file