diff --git a/plugins/bind9/bind9_rr b/plugins/bind9/bind9_rr
index f6193177..2d028ca7 100755
--- a/plugins/bind9/bind9_rr
+++ b/plugins/bind9/bind9_rr
@@ -95,8 +95,10 @@ sub do_stats {
 
     open(Q,"> $STATEFILE") or die;
     foreach $k (@INkeys[0 .. 19]) {
-        print "rr_$k.value ",$IN{$k},"\n";
-        print Q "$k ",$IN{$k},"\n";
+        next if not defined $k;
+        my $l = $k; $k =~ tr/\./_/;
+        print "rr_$k.value ",$IN{$l},"\n";
+        print Q "$l ",$IN{$l},"\n";
     }
     close(Q);
 }
@@ -114,7 +116,9 @@ graph_vlabel Queries / \${graph_period}
     my @INkeys = sort { $IN{$b} <=> $IN{$a} } keys %IN;
 
     foreach $k (@INkeys[0 .. 19]) {
-        print "rr_$k.label $k
+        next if not defined $k;
+        my $l = $k; $k =~ tr/\./_/;
+        print "rr_$k.label $l
 rr_$k.type DERIVE
 rr_$k.min 0
 rr_$k.draw STACK