diff --git a/vis/floormap.in b/vis/floormap.in
index 18f7e5dd31f572e202367e8cc9638aa1a827aa18..887041dfd7fb05704a8915bf27f0d7861a554429 100755
--- a/vis/floormap.in
+++ b/vis/floormap.in
@@ -797,9 +797,11 @@ sub dofloor($$)
 		}
 	    }
 
-	    # Link to a special page for the pc600 Wifi Cluster nodes.
+	    # Link to a special page for the pc600 Wifi Cluster nodes, 
+	    # except on their own map.
 	    my $ispc600wifi = defined($rowref->{"feature"}) &&
-		$rowref->{"feature"} eq "pc600wifi";
+		$rowref->{"feature"} eq "pc600wifi" && 
+		    $building ne $pc600wifi_bldg;
 	    $props->{'ISPC600WIFI'} = $ispc600wifi;
 
             my $x2 = $x + $DOT_RAD;
@@ -881,7 +883,7 @@ sub dofloor($$)
 				    ($o > 180.0 && $o < 360.0)));
 	    
 	    # No labels on the pc600 wifi cluster nodes, except on their own map.
-	    if (!$ispc600wifi || $building eq $pc600wifi_bldg) {
+	    if (!$ispc600wifi) {
 		$err = $baseimage->Annotate(fill=>'black', x=>$lx, y=>$ly, 
 					    text=>"$label");
 		warn "$err" if "$err";