diff --git a/.gitattributes b/.gitattributes
index 280c626acbc..cf1d98c43c4 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2043,6 +2043,7 @@ res/cardsfolder/illusionary_forces.txt -text svneol=native#text/plain
 res/cardsfolder/illusionary_servant.txt -text svneol=native#text/plain
 res/cardsfolder/illusionary_wall.txt -text svneol=native#text/plain
 res/cardsfolder/illusions_of_grandeur.txt -text svneol=native#text/plain
+res/cardsfolder/imi_statue.txt -text svneol=native#text/plain
 res/cardsfolder/immaculate_magistrate.txt -text svneol=native#text/plain
 res/cardsfolder/immolation.txt -text svneol=native#text/plain
 res/cardsfolder/imperial_edict.txt -text svneol=native#text/plain
diff --git a/res/cardsfolder/imi_statue.txt b/res/cardsfolder/imi_statue.txt
new file mode 100644
index 00000000000..c1d4303a853
--- /dev/null
+++ b/res/cardsfolder/imi_statue.txt
@@ -0,0 +1,7 @@
+Name:Imi Statue
+ManaCost:3
+Types:Artifact
+Text:Players can't untap more than one artifact during their untap steps.
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/imi_statue.jpg
+End
diff --git a/src/forge/Input_Untap.java b/src/forge/Input_Untap.java
index de72f7f347f..b172f22b648 100644
--- a/src/forge/Input_Untap.java
+++ b/src/forge/Input_Untap.java
@@ -153,20 +153,20 @@ public class Input_Untap extends Input {
     			
     		}
     	}
-    	if( AllZoneUtil.isCardInPlay("Damping Field") ) {
-    		if( AllZone.Phase.getActivePlayer().equals(AllZone.ComputerPlayer) ) {
+    	if( AllZoneUtil.isCardInPlay("Damping Field") || AllZoneUtil.isCardInPlay("Imi Statue")) {
+    		if( AllZone.Phase.getActivePlayer().isComputer() ) {
     			CardList artList = AllZoneUtil.getPlayerCardsInPlay(AllZone.ComputerPlayer);
     			artList = artList.filter(AllZoneUtil.artifacts);
     			artList = artList.filter(AllZoneUtil.tapped);
     			if( artList.size() > 0 ) {
-    				artList.get(0).untap();
+    				CardFactoryUtil.AI_getBestArtifact(artList).untap();
     			}
     		}
     		else {
     			Input target = new Input() {
 					private static final long serialVersionUID = 5555427219659889707L;
 					public void showMessage() {
-    					AllZone.Display.showMessage("Damping Field - Select one artifact to untap");
+    					AllZone.Display.showMessage("Select one tapped artifact to untap");
     					ButtonUtil.enableOnlyCancel();
     				}
     				public void selectButtonCancel() {stop();}