diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java
index 72d203ee4c6..6bf6f65cd03 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -4424,8 +4424,7 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
 
         // remote access vpn can be enabled only for static nat ip, so this part should never be executed under normal
         // conditions
-        // only when ip address failed to be cleaned up as a part of account destroy and was marked as Releasing, this
-// part of
+        // only when ip address failed to be cleaned up as a part of account destroy and was marked as Releasing, this part of
         // the code would be triggered
         s_logger.debug("Cleaning up remote access vpns as a part of public IP id=" + ipId + " release...");
         try {
diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
index ece8c0a13b5..103e80445cb 100644
--- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java
+++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
@@ -1538,7 +1538,7 @@ public class VpcManagerImpl implements VpcManager, Manager{
         }
         
         if (gatewayId != null) {
-            sc.addAnd("vpcGatewayId", Op.EQ, vpcId);
+            sc.addAnd("vpcGatewayId", Op.EQ, gatewayId);
         }
         
         if (tags != null && !tags.isEmpty()) {