diff --git a/core/src/com/cloud/agent/api/routing/SetFirewallRuleCommand.java b/core/src/com/cloud/agent/api/routing/SetFirewallRuleCommand.java
index 97e7bc7fbe5..f10ecbf7117 100755
--- a/core/src/com/cloud/agent/api/routing/SetFirewallRuleCommand.java
+++ b/core/src/com/cloud/agent/api/routing/SetFirewallRuleCommand.java
@@ -25,7 +25,6 @@ public class SetFirewallRuleCommand extends RoutingCommand {
     String routerIpAddress;
     String oldPrivateIP = null;
     String oldPrivatePort = null;
-    boolean nat = false;
     boolean create = false;
     
     protected SetFirewallRuleCommand() {
@@ -39,10 +38,9 @@ public class SetFirewallRuleCommand extends RoutingCommand {
     	this.oldPrivatePort = oldPrivatePort;
     }
     
-    public SetFirewallRuleCommand(String routerName, String routerIpAddress, boolean nat, FirewallRuleVO rule2, boolean create) {
+    public SetFirewallRuleCommand(String routerName, String routerIpAddress,FirewallRuleVO rule2, boolean create) {
     	this.routerName = routerName;
     	this.routerIpAddress = routerIpAddress;
-    	this.nat = nat;
     	this.rule = new FirewallRuleVO(rule2);
     	this.create = create;
     }
diff --git a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index 234ddda6a6c..ffca282dd1b 100644
--- a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -1147,7 +1147,7 @@ public abstract class CitrixResourceBase implements StoragePoolResource, ServerR
     protected Answer execute(final SetFirewallRuleCommand cmd) {
         String args;
 
-        if(cmd.isNat()){
+        if(cmd.getProtocol().toLowerCase().equals(NetUtils.NAT_PROTO)){
         	//1:1 NAT needs instanceip;publicip;domrip;op
         	if(cmd.isCreate())
         		args = "-A";
diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java
index 24147b48942..bb07769fd5e 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -870,7 +870,7 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
 
             if (rule.isForwarding()) {
                 fwdRules.add(rule);
-                final SetFirewallRuleCommand cmd = new SetFirewallRuleCommand(routerName, routerIp, false, rule, false);
+                final SetFirewallRuleCommand cmd = new SetFirewallRuleCommand(routerName, routerIp,rule, false);
                 cmds.addCommand(cmd);
             } else if (rule.getGroupId() != null){
                 lbRules.add(rule);
@@ -952,7 +952,7 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
         	rule.setVlanNetmask(vlanNetmask);
             if (rule.isForwarding()) {
                 fwdRules.add(rule);
-                final SetFirewallRuleCommand cmd = new SetFirewallRuleCommand(router.getInstanceName(), router.getPrivateIpAddress(), false, rule, false);
+                final SetFirewallRuleCommand cmd = new SetFirewallRuleCommand(router.getInstanceName(), router.getPrivateIpAddress(),rule, false);
                 cmds.addCommand(cmd);
             }
         }
@@ -3251,7 +3251,7 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
     private boolean  createOrDeleteIpForwardingRuleOnDomr(FirewallRuleVO fwRule, DomainRouterVO router, String guestIp, boolean create){
     	
         Commands cmds = new Commands(OnError.Continue);
-        final SetFirewallRuleCommand cmd = new SetFirewallRuleCommand(router.getInstanceName(), router.getPrivateIpAddress(), true, fwRule, create);
+        final SetFirewallRuleCommand cmd = new SetFirewallRuleCommand(router.getInstanceName(), router.getPrivateIpAddress(),fwRule, create);
         cmds.addCommand(cmd);       
         try {
             _agentMgr.send(router.getHostId(), cmds);