diff --git a/hypgraph.cpp b/hypgraph.cpp
index 1460dd27..3050b087 100644
--- a/hypgraph.cpp
+++ b/hypgraph.cpp
@@ -1519,8 +1519,8 @@ bool do_draw(cell *c) {
   // do not display out of range cells, unless on torus
   if(c->pathdist == PINFD && geometry != gTorus && vid.use_smart_range == 0)
     return false;
-  // do not display not fully generated cells, unless a cheater
-  if(c->mpdist > 7 && !cheater && !autocheat) return false;
+  // do not display not fully generated cells, unless changing range allowed
+  if(c->mpdist > 7 && !allowChangeRange()) return false;
   // in the Yendor Challenge, scrolling back is forbidden
   if(c->cpdist > 7 && yendor::on && !cheater && !autocheat) return false;
 
diff --git a/system.cpp b/system.cpp
index 7792e7d2..581b2999 100644
--- a/system.cpp
+++ b/system.cpp
@@ -301,7 +301,7 @@ void initgame() {
   if(quotient || sphere)
     for(cell *c: currentmap->allcells()) setdist(c, 8, NULL);
 
-  if(!cheater) {
+  if(!allowChangeRange()) {
     gamerange_bonus = genrange_bonus = 0;
     if(vid.use_smart_range == 2) vid.use_smart_range = 1;
     }