diff --git a/src/fr/devinsy/logar/app/anonymizer/Ipv4Generator.java b/src/fr/devinsy/logar/app/anonymizer/Ipv4Generator.java
index 9a6ae0f..a26d25b 100644
--- a/src/fr/devinsy/logar/app/anonymizer/Ipv4Generator.java
+++ b/src/fr/devinsy/logar/app/anonymizer/Ipv4Generator.java
@@ -19,6 +19,7 @@
 package fr.devinsy.logar.app.anonymizer;
 
 import org.apache.commons.lang3.RandomUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -236,13 +237,17 @@ public final class Ipv4Generator
         {
             result = null;
         }
+        else if (StringUtils.equalsAny(ip, "0.0.0.0", "127.0.0.1"))
+        {
+            result = ip;
+        }
         else
         {
             result = random(ip.length());
 
-            if (result.equals(ip))
+            while (StringUtils.equals(result, ip))
             {
-                random(ip);
+                result = random(ip);
             }
         }
 
diff --git a/src/fr/devinsy/logar/app/anonymizer/Ipv6Generator.java b/src/fr/devinsy/logar/app/anonymizer/Ipv6Generator.java
index 6a9f856..8591157 100644
--- a/src/fr/devinsy/logar/app/anonymizer/Ipv6Generator.java
+++ b/src/fr/devinsy/logar/app/anonymizer/Ipv6Generator.java
@@ -19,6 +19,7 @@
 package fr.devinsy.logar.app.anonymizer;
 
 import org.apache.commons.lang3.RandomStringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -80,9 +81,9 @@ public final class Ipv6Generator
             }
             result = buffer.toString();
 
-            if (result.equals(ip))
+            while (StringUtils.equals(result, ip))
             {
-                random(ip);
+                result = random(ip);
             }
         }