diff --git a/doc/fixes3-7-0.txt b/doc/fixes3-7-0.txt
index 04c24d09c..144810fff 100644
--- a/doc/fixes3-7-0.txt
+++ b/doc/fixes3-7-0.txt
@@ -2043,6 +2043,8 @@ non-fireproof water walking boots wouldn't be burnt up if fire resistant hero
 	walked on molten lava
 1x1 poison gas clouds for green dragon and iron golem breath could be placed
 	at wall locations
+if a pile of objects had arrow(s) on top, map location classification got
+	confused and reported 'unexplore area'
 
 
 Fixes to 3.7.0-x Platform and/or Interface Problems Exposed Via git Repository
diff --git a/include/display.h b/include/display.h
index 1ec34f46d..f92916490 100644
--- a/include/display.h
+++ b/include/display.h
@@ -837,20 +837,20 @@ enum glyph_offsets {
 /* generic objects are after strange object (GLYPH_OBJ_OFF) and before
    other objects (GLYPH_OBJ_OFF + FIRST_OBJECT) */
 #define glyph_is_normal_generic_obj(glyph) \
-    ((glyph) > GLYPH_OBJ_OFF && (glyph) < GLYPH_OBJ_OFF + FIRST_OBJECT)
+    ((glyph) > GLYPH_OBJ_OFF && (glyph) < GLYPH_OBJ_OFF + FIRST_OBJECT - 1)
 #define glyph_is_piletop_generic_obj(glyph) \
     ((glyph) > GLYPH_OBJ_PILETOP_OFF                            \
-     && (glyph) < GLYPH_OBJ_PILETOP_OFF + FIRST_OBJECT)
+     && (glyph) < GLYPH_OBJ_PILETOP_OFF + FIRST_OBJECT - 1)
 #define glyph_is_generic_object(glyph) \
     (glyph_is_normal_generic_obj(glyph)                         \
      || glyph_is_piletop_generic_obj(glyph))
 #define glyph_is_normal_piletop_obj(glyph) \
     ((glyph) == GLYPH_OBJ_PILETOP_OFF                           \
-     || ((glyph) > GLYPH_OBJ_PILETOP_OFF + FIRST_OBJECT         \
+     || ((glyph) > GLYPH_OBJ_PILETOP_OFF + FIRST_OBJECT - 1     \
          && (glyph) < (GLYPH_OBJ_PILETOP_OFF + NUM_OBJECTS)))
 #define glyph_is_normal_object(glyph) \
     ((glyph) == GLYPH_OBJ_OFF                                   \
-     || ((glyph) >= GLYPH_OBJ_OFF + FIRST_OBJECT                \
+     || ((glyph) >= GLYPH_OBJ_OFF + FIRST_OBJECT - 1            \
          && (glyph) < (GLYPH_OBJ_OFF + NUM_OBJECTS))            \
      || glyph_is_normal_piletop_obj(glyph))