diff --git a/.idea/.idea.cloud.insecurity.docker/.idea/vcs.xml b/.idea/.idea.cloud.insecurity.docker/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/.idea.cloud.insecurity.docker/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/cloud.insecurity.docker.ipam/Scope.cs b/cloud.insecurity.docker.ipam/Scope.cs
index 4965e09..d46daa6 100644
--- a/cloud.insecurity.docker.ipam/Scope.cs
+++ b/cloud.insecurity.docker.ipam/Scope.cs
@@ -187,11 +187,10 @@ namespace cloud.insecurity.docker.ipam
                 
                 try
                 {
-                    
-                    var test = Db.GetCollection("Scopes").FindAll();
-                    
-                     newScope = Db.GetCollection<Scope>("Scopes")
-                         .Find(s => s.Id == GetUniqueId(scope.network, scope.prefix)).First();
+                    newScope = Db.GetCollection<Scope>("Scopes")
+                        .Find(s => s.Id == GetUniqueId(scope.network, (scope.prefix != 0) 
+                            ? scope.prefix 
+                            : (int)parent.Schema.child_prefix)).SingleOrDefault();
                 }
                 catch(Exception ex)
                 {
diff --git a/cloud.insecurity.docker.ipam/bin/Debug/net5.0/IPAM-log.db b/cloud.insecurity.docker.ipam/bin/Debug/net5.0/IPAM-log.db
index 8313a6d..112baaa 100644
Binary files a/cloud.insecurity.docker.ipam/bin/Debug/net5.0/IPAM-log.db and b/cloud.insecurity.docker.ipam/bin/Debug/net5.0/IPAM-log.db differ
diff --git a/cloud.insecurity.docker.ipam/bin/Debug/net5.0/IPAM.db b/cloud.insecurity.docker.ipam/bin/Debug/net5.0/IPAM.db
index 68e42ad..2ddaf21 100644
Binary files a/cloud.insecurity.docker.ipam/bin/Debug/net5.0/IPAM.db and b/cloud.insecurity.docker.ipam/bin/Debug/net5.0/IPAM.db differ
diff --git a/cloud.insecurity.docker.ipam/bin/Debug/net5.0/cloud.insecurity.docker.ipam.dll b/cloud.insecurity.docker.ipam/bin/Debug/net5.0/cloud.insecurity.docker.ipam.dll
index e223015..598933b 100644
Binary files a/cloud.insecurity.docker.ipam/bin/Debug/net5.0/cloud.insecurity.docker.ipam.dll and b/cloud.insecurity.docker.ipam/bin/Debug/net5.0/cloud.insecurity.docker.ipam.dll differ
diff --git a/cloud.insecurity.docker.ipam/bin/Debug/net5.0/cloud.insecurity.docker.ipam.pdb b/cloud.insecurity.docker.ipam/bin/Debug/net5.0/cloud.insecurity.docker.ipam.pdb
index 6223f30..1dfb4ce 100644
Binary files a/cloud.insecurity.docker.ipam/bin/Debug/net5.0/cloud.insecurity.docker.ipam.pdb and b/cloud.insecurity.docker.ipam/bin/Debug/net5.0/cloud.insecurity.docker.ipam.pdb differ
diff --git a/cloud.insecurity.docker.ipam/bin/Debug/net5.0/ref/cloud.insecurity.docker.ipam.dll b/cloud.insecurity.docker.ipam/bin/Debug/net5.0/ref/cloud.insecurity.docker.ipam.dll
index a8c9098..04d614a 100644
Binary files a/cloud.insecurity.docker.ipam/bin/Debug/net5.0/ref/cloud.insecurity.docker.ipam.dll and b/cloud.insecurity.docker.ipam/bin/Debug/net5.0/ref/cloud.insecurity.docker.ipam.dll differ
diff --git a/cloud.insecurity.docker.ipam/obj/Debug/net5.0/cloud.insecurity.docker.ipam.dll b/cloud.insecurity.docker.ipam/obj/Debug/net5.0/cloud.insecurity.docker.ipam.dll
index e223015..598933b 100644
Binary files a/cloud.insecurity.docker.ipam/obj/Debug/net5.0/cloud.insecurity.docker.ipam.dll and b/cloud.insecurity.docker.ipam/obj/Debug/net5.0/cloud.insecurity.docker.ipam.dll differ
diff --git a/cloud.insecurity.docker.ipam/obj/Debug/net5.0/cloud.insecurity.docker.ipam.pdb b/cloud.insecurity.docker.ipam/obj/Debug/net5.0/cloud.insecurity.docker.ipam.pdb
index 6223f30..1dfb4ce 100644
Binary files a/cloud.insecurity.docker.ipam/obj/Debug/net5.0/cloud.insecurity.docker.ipam.pdb and b/cloud.insecurity.docker.ipam/obj/Debug/net5.0/cloud.insecurity.docker.ipam.pdb differ
diff --git a/cloud.insecurity.docker.ipam/obj/Debug/net5.0/ref/cloud.insecurity.docker.ipam.dll b/cloud.insecurity.docker.ipam/obj/Debug/net5.0/ref/cloud.insecurity.docker.ipam.dll
index a8c9098..04d614a 100644
Binary files a/cloud.insecurity.docker.ipam/obj/Debug/net5.0/ref/cloud.insecurity.docker.ipam.dll and b/cloud.insecurity.docker.ipam/obj/Debug/net5.0/ref/cloud.insecurity.docker.ipam.dll differ