diff --git a/Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psm1 b/Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psm1
index 70e8ba1..de52816 100644
--- a/Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psm1
+++ b/Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psm1
@@ -464,8 +464,8 @@ Function New-NSXTFirewall {
         [Parameter(Mandatory=$True)]$Name,
         [Parameter(Mandatory=$true)][ValidateSet("MGW","CGW")][String]$GatewayType,
         [Parameter(Mandatory=$True)]$SequenceNumber,
-        [Parameter(Mandatory=$True)]$SourceGroup,
-        [Parameter(Mandatory=$True)]$DestinationGroup,
+        [Parameter(Mandatory=$False)]$SourceGroup,
+        [Parameter(Mandatory=$False)]$DestinationGroup,
         [Parameter(Mandatory=$True)]$Service,
         [Parameter(Mandatory=$True)][ValidateSet("ALLOW","DENY")]$Action,
         [Parameter(Mandatory=$false)]$InfraScope,
@@ -490,7 +490,7 @@ Function New-NSXTFirewall {
         }
 
         if(! $DestinationInfraGroup) {
-            foreach ($group in $SourceInfraGroup) {
+            foreach ($group in $DestinationInfraGroup) {
                 $tmp = (Get-NSXTInfraGroup -Name $group).Path
                 $destinationGroups+= $tmp
             }