diff --git a/gatherer/interface_information.sh b/gatherer/interface_information.sh
index 5b872f6..e8088a5 100644
--- a/gatherer/interface_information.sh
+++ b/gatherer/interface_information.sh
@@ -67,8 +67,6 @@ gather_if_info_ip() {
 		print "IF_NUMBERS=\"" if_numbers "\";";
 	}')
 
-	echo "DEBUG: ${IF_NO}"
-
 	eval $(${IP} -o addr | ${AWK} -v if_numbers="${IF_NUMBERS}" '{
         sub(/:/,"",$1);
         if_no=$1;
@@ -77,12 +75,12 @@ gather_if_info_ip() {
             split($4,addr,/[\/]/);
             print "IF" no "_IPV4=\"${IF" no "_IPV4}" addr[1] " \";";
 			network(no, addr[1], addr[2]);
-            classes=classes $4 " "
+            classes=classes addr[1] " "
         }
         if ($3 == "inet6") {
             split($4,addr,/[\/]/);
             print "IF" no "_IPV6=\"${IF" no "_IPV6}" addr[1] " \";";
-            classes=classes $4 " "
+            classes=classes addr[1] " "
         }
     }
     BEGIN {
@@ -123,7 +121,7 @@ gather_if_info_ip() {
                 net=net ".";
             }
         }
-		classes=classes " " net;
+		classes=classes net " ";
         print "IF" no "_NETWORK=\"" net "\"; export " name "_NETWORK;";
         print "IF" no "_MASK=\"" mask "\"; export " name "_MASK;";
 	}')