diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index 9846b9f5c..a4d8e9f04 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -45919,7 +45919,7 @@ type=Artifact
 [card]
 name=Skullclamp
 auto=1/-1
-auto=@movedto(mytgt|graveyard):draw:2 controller
+auto=@movedto(graveyard) from(mytgt|battlefield):draw:2 controller
 auto={1}:equip
 text=Equipped creature gets +1/-1. -- When equipped creature is put into a graveyard, draw two cards. -- Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery. This card enters the battlefield unattached and stays on the battlefield if the creature leaves.)
 mana={1}
diff --git a/projects/mtg/bin/Res/test/_tests.txt b/projects/mtg/bin/Res/test/_tests.txt
index fff240157..b67b16024 100644
--- a/projects/mtg/bin/Res/test/_tests.txt
+++ b/projects/mtg/bin/Res/test/_tests.txt
@@ -426,6 +426,7 @@ skullcage5_i239.txt
 skullcage6_i239.txt
 skullcage7_i239.txt
 skullclamp.txt
+skullclamp2_i439.txt
 shepherd_of_rot.txt
 shivan_hellkite.txt
 shock.txt
diff --git a/projects/mtg/bin/Res/test/bugs/skullclamp2_i439.txt b/projects/mtg/bin/Res/test/skullclamp2_i439.txt
similarity index 100%
rename from projects/mtg/bin/Res/test/bugs/skullclamp2_i439.txt
rename to projects/mtg/bin/Res/test/skullclamp2_i439.txt
diff --git a/projects/mtg/template.vcproj b/projects/mtg/template.vcproj
index 162c15f61..ff01e01da 100644
--- a/projects/mtg/template.vcproj
+++ b/projects/mtg/template.vcproj
@@ -874,6 +874,10 @@
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl"
 			>
+			<File
+				RelativePath=".\include\ActionElement.h"
+				>
+			</File>
 			<File
 				RelativePath=".\include\ActionLayer.h"
 				>
@@ -1263,27 +1267,7 @@
 			Name="Resource Files"
 			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
 			>
-			<File
-				RelativePath=".\bin\Res\sets\primitives\mtg.txt"
-				>
-			</File>
-			<File
-				RelativePath=".\bin\Res\sets\primitives\unofficial.txt"
-				>
-			</File>
-			<File
-				RelativePath=".\bin\Res\sets\primitives\zethaddon.txt"
-				>
-			</File>
 		</Filter>
-		<File
-			RelativePath=".\include\ActionElement.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ClassDiagram1.cd"
-			>
-		</File>
 	</Files>
 	<Globals>
 	</Globals>