diff --git a/includes/discovery/ipv6-addresses.php b/includes/discovery/ipv6-addresses.php
index 2568c261d1..58349f15d3 100644
--- a/includes/discovery/ipv6-addresses.php
+++ b/includes/discovery/ipv6-addresses.php
@@ -39,7 +39,7 @@ if (!$oids)
    if($data) {
     $data = trim($data);
     list($if_ipv6addr,$ipv6_prefixlen) = explode(" ", $data);
-    list($ifindex,$ipv6addr) = split("\\.",$if_ipv6addr,2);
+    list($ifIndex,$ipv6addr) = split("\\.",$if_ipv6addr,2);
     $ipv6_address = snmp2ipv6($ipv6addr);
 
     $ipv6_origin    = trim(shell_exec($config['snmpget']." -m IPV6-MIB -Ovq -".$device['snmpver']." -c ".$device['community']." ".$device['hostname'].":".$device['port']." IPV6-MIB::ipv6AddrType.$if_ipv6addr"));
diff --git a/includes/functions.php b/includes/functions.php
index 11270f08e3..676759c0d2 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -684,13 +684,12 @@ function snmp2ipv6($ipv6_snmp)
 function ipv62snmp($ipv6)
 {
   $ipv6_ex = explode(':',Net_IPv6::uncompress($ipv6));
-  for ($i = 0;$i < 8;$i++) { while (strlen($ipv6_ex[$i]) < 4) $ipv6_ex[$i] = "0" . $ipv6_ex[$i]; } # Pad zeroes back
+  for ($i = 0;$i < 8;$i++) { $ipv6_ex[$i] = zeropad_lineno($ipv6_ex[$i]); }
   $ipv6_ip = implode('',$ipv6_ex);
   for ($i = 0;$i < 16;$i+=2) $ipv6_split[] = hexdec(substr($ipv6_ip,$i,2));
-  return implode($ipv6_split,'.');
+  return implode('.',$ipv6_split);
 }
 
-
 function discover_process_ipv6($ifIndex,$ipv6_address,$ipv6_prefixlen,$ipv6_origin)
 {
   global $valid_v6,$device,$config;