diff --git a/fw-addr-lists.rsc b/fw-addr-lists.rsc
index 3a92aede..cd136f95 100644
--- a/fw-addr-lists.rsc
+++ b/fw-addr-lists.rsc
@@ -56,20 +56,6 @@
   }
 
   :local ListComment ("managed by " . $ScriptName);
-  :local Maskv4 ({});
-  :for I from=0 to=32 do={
-    :local List ("mask-" . $I);
-    /ip/firewall/address-list/add dynamic=yes timeout=1s list=$List address=("255.255.255.255/" . $I);
-    :local Address [ /ip/firewall/address-list/get [ find where dynamic=yes list=$List ] address ];
-    :set ($Maskv4->$I) [ :toip [ :pick $Address 0 [ :find Address "/" ] ] ];
-  }
-  :local Maskv6 ({});
-  :for I from=0 to=128 do={
-    :local List ("mask-" . $I);
-    /ipv6/firewall/address-list/add dynamic=yes timeout=1s list=$List address=("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff/" . $I);
-    :local Address [ /ipv6/firewall/address-list/get [ find where dynamic=yes list=$List ] address ];
-    :set ($Maskv4->$I) [ :toip6 [ :pick $Address 0 [ :find Address "/" ] ] ];
-  }
 
   :foreach FwListName,FwList in=$FwAddrLists do={
     :local CntAdd 0;
@@ -128,7 +114,9 @@
         :do {
           :local Branch;
           :if ($Address ~ "^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(/[0-9]{1,2})?\$") do={
-            :set Address 
+            :if ($Address ~ "/32\$") do={
+              :set Address [ :pick $Address 0 ([ :len $Address ] - 3) ];
+            }
             :set Branch [ $GetBranch $Address ];
             :set ($IPv4Addresses->$Branch->$Address) $TimeOut;
             :error true;
@@ -141,7 +129,7 @@
               :set Net [ :toip6 [ :pick $Address 0 $Slash ] ]
               :set Cidr [ $MIN [ :pick $Address ($Slash + 1) [ :len $Address ] ] 64 ];
             }
-            :set Address (([ :toip6 $Net ] & ($Maskv6->$Cidr)) . "/" . $Cidr);
+            :set Address (([ :toip6 $Net ] & ffff:ffff:ffff:ffff::) . "/" . $Cidr);
             :set Branch [ $GetBranch $Address ];
             :set ($IPv6Addresses->$Branch->$Address) $TimeOut;
             :error true;