Index: html/includes/graphs/device/nfsen_common.inc.php
===================================================================
--- html/includes/graphs/device/nfsen_common.inc.php    (revision 3712)
+++ html/includes/graphs/device/nfsen_common.inc.php    (working copy)
@@ -7,12 +7,14 @@
 foreach ( $config['nfsen_rrds'] as $nfsenrrds )
 {
   if ($configs[strlen($nfsenrrds)-1] != '/') { $nfsenrrds .= '/'; }
-
-  # convert dots in filename to underscores
-  $nfsensuffix = "";
-  if ($config['nfsen_suffix']) { $nfsensuffix = $config['nfsen_suffix']; }
   $basefilename_underscored = preg_replace('/\./', $config['nfsen_split_char'], $device['hostname']);
-  $nfsen_filename = (strstr($basefilename_underscored, $nfsensuffix, true));
+  
+  if ($config['nfsen_suffix']) 
+  {
+    $nfsen_filename = (strstr($basefilename_underscored, $config['nfsen_suffix'], true));
+  } else {
+    $nfsen_filename = $basefilename_underscored;
+  }
 
   if (is_file($nfsenrrds . $nfsen_filename . ".rrd"))
   {
@@ -24,7 +26,6 @@
     $nfsen_iter=1;
     foreach ($flowtypes as $flowtype)
     {
-
       $rrd_list[$nfsen_iter]['filename'] = $rrd_filename;
       $rrd_list[$nfsen_iter]['descr'] = $flowtype;
       $rrd_list[$nfsen_iter]['ds'] = $dsprefix . $flowtype;