diff --git a/usr/local/www/firewall_nat_edit.php b/usr/local/www/firewall_nat_edit.php
index d7806b1a1c..719e32f454 100755
--- a/usr/local/www/firewall_nat_edit.php
+++ b/usr/local/www/firewall_nat_edit.php
@@ -625,13 +625,13 @@ include("fbegin.inc"); ?>
 <?php							if (is_array($config['virtualip']['vip'])):
 									foreach ($config['virtualip']['vip'] as $sn):
 										if ($sn['mode'] == "proxyarp" && $sn['type'] == "network"):
-											$baseip = ip2long32($sn['subnet']) & ip2long(gen_subnet_mask($sn['subnet_bits']));
-
-											for ($i = $sn['subnet_bits'] - 1; $i <= 32; $i++):
-												$snip = long2ip32($baseip);
+											$start = ip2long32(gen_subnet($sn['subnet'], $sn['subnet_bits']));
+											$end = ip2long32(gen_subnet_max($sn['subnet'], $sn['subnet_bits']));
+											$len = $end - $start;
+											for ($i = 0; $i <= $len; $i++):
+												$snip = long2ip32($start+$i);
 ?>
 												<option value="<?=$snip;?>" <?php if ($snip == $pconfig['dst']) echo "selected"; ?>><?=htmlspecialchars("{$snip} ({$sn['descr']})");?></option>
-												<?php $baseip = $baseip + 1; ?>
 <?php										endfor;
 										else:
 ?>