diff --git a/netwerk/wifi/src/nsWifiScannerUnix.cpp b/netwerk/wifi/src/nsWifiScannerUnix.cpp
index 2c23ee7c1bb..b818a16d84f 100644
--- a/netwerk/wifi/src/nsWifiScannerUnix.cpp
+++ b/netwerk/wifi/src/nsWifiScannerUnix.cpp
@@ -99,8 +99,7 @@ static int scan_wifi(int skfd, char* ifname, char* args[], int count)
     return 0;
   }
   
-  buffer[wrq.u.essid.length] = 0;
-  strncpy(ap->mSsid, buffer, 32);
+  ap->setSSID(buffer, wrq.u.essid.length);
 
   result = iw_get_ext(skfd, ifname, SIOCGIWAP, &wrq);
   if (result < 0) {
@@ -118,9 +117,9 @@ static int scan_wifi(int skfd, char* ifname, char* args[], int count)
   }
 
   if(stats.qual.level > range.max_qual.level)
-    ap->mSignal = stats.qual.level - 0x100;
+    ap->setSignal(stats.qual.level - 0x100);
   else
-    ap->mSignal = 0;
+    ap->setSignal(0);
 
   accessPoints->AppendObject(ap);
   return 0;