diff --git a/common/buildcraft/transport/gui/ContainerGateInterface.java b/common/buildcraft/transport/gui/ContainerGateInterface.java
index 6dc186e5..93681769 100644
--- a/common/buildcraft/transport/gui/ContainerGateInterface.java
+++ b/common/buildcraft/transport/gui/ContainerGateInterface.java
@@ -100,27 +100,23 @@ public class ContainerGateInterface extends BuildCraftContainer {
 			potentialTriggers.addAll(gate.getAllValidTriggers());
 			potentialActions.addAll(gate.getAllValidActions());
 
-			if (gate.material.numTriggerParameters == 0) {
-				Iterator<IStatement> it = potentialTriggers.iterator();
+			Iterator<IStatement> it = potentialTriggers.iterator();
 
-				while (it.hasNext()) {
-					IStatement trigger = it.next();
+			while (it.hasNext()) {
+				IStatement trigger = it.next();
 
-					if (trigger.minParameters() > 0) {
-						it.remove();
-					}
+				if (trigger.minParameters() > gate.material.numTriggerParameters) {
+					it.remove();
 				}
 			}
 
-			if (gate.material.numActionParameters == 0) {
-				Iterator<IStatement> it = potentialActions.iterator();
+			it = potentialActions.iterator();
 
-				while (it.hasNext()) {
-					IStatement action = it.next();
+			while (it.hasNext()) {
+				IStatement action = it.next();
 
-					if (action.minParameters() > 0) {
-						it.remove();
-					}
+				if (action.minParameters() > gate.material.numActionParameters) {
+					it.remove();
 				}
 			}
 		}
diff --git a/common/buildcraft/transport/gui/GuiGateInterface.java b/common/buildcraft/transport/gui/GuiGateInterface.java
index dfd66895..dbe31e01 100644
--- a/common/buildcraft/transport/gui/GuiGateInterface.java
+++ b/common/buildcraft/transport/gui/GuiGateInterface.java
@@ -412,7 +412,11 @@ public class GuiGateInterface extends GuiAdvancedInterface {
 			}
 
 			for (StatementParameterSlot p : triggerSlot.parameters) {
-				container.setTriggerParameter(triggerSlot.slot, p.slot, null, true);
+				IStatementParameter parameter = null;
+				if (changed != null && p.slot < changed.minParameters()) {
+					parameter = changed.createParameter(p.slot);
+				}
+				container.setTriggerParameter(triggerSlot.slot, p.slot, parameter, true);
 			}
 		} else if (slot instanceof ActionSlot) {
 			ActionSlot actionSlot = (ActionSlot) slot;
@@ -451,7 +455,11 @@ public class GuiGateInterface extends GuiAdvancedInterface {
 			}
 
 			for (StatementParameterSlot p : actionSlot.parameters) {
-				container.setActionParameter(actionSlot.slot, p.slot, null, true);
+				IStatementParameter parameter = null;
+				if (changed != null && p.slot < changed.minParameters()) {
+					parameter = changed.createParameter(p.slot);
+				}
+				container.setActionParameter(actionSlot.slot, p.slot, parameter, true);
 			}
 		} else if (slot instanceof StatementParameterSlot) {
 			StatementParameterSlot paramSlot = (StatementParameterSlot) slot;