diff --git a/src/forge/InputControl.java b/src/forge/InputControl.java
index 0febc91717c..8f2c563bb10 100644
--- a/src/forge/InputControl.java
+++ b/src/forge/InputControl.java
@@ -16,7 +16,7 @@ public class InputControl extends MyObservable implements java.io.Serializable {
     // todo: needs a bit more work to allow mana abilities to put Inputs "on hold" while they are paid and then reinstuted
     
     public void setInput(final Input in) {
-        if(!(input == null || input instanceof Input_PassPriority)) 
+        if(bResolving || !(input == null || input instanceof Input_PassPriority)) 
         	inputStack.add(in);
         else 
         	input = in;