diff --git a/doc/fixes36.1 b/doc/fixes36.1
index f812c44de..237f41a8e 100644
--- a/doc/fixes36.1
+++ b/doc/fixes36.1
@@ -242,6 +242,8 @@ after using detection magic or #terrain while underwater, then leaving water
 	and saving while on land, save would flag you as underwater again and
 	then restore would limit the map display accordingly; next move would
 	notice, retify things, and report "you are on solid land again"
+change #terrain used while underwater to view the regular map rather than the
+	crippled underwater one
 can see or feel adjacent lava or ice when underwater
 
 
diff --git a/src/detect.c b/src/detect.c
index 08773c20d..1d89e58af 100644
--- a/src/detect.c
+++ b/src/detect.c
@@ -1,4 +1,4 @@
-/* NetHack 3.6	detect.c	$NHDT-Date: 1446369464 2015/11/01 09:17:44 $  $NHDT-Branch: master $:$NHDT-Revision: 1.61 $ */
+/* NetHack 3.6	detect.c	$NHDT-Date: 1463191981 2016/05/14 02:13:01 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.70 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -1535,6 +1535,8 @@ int which_subset; /* when not full, whether to suppress objs and/or traps */
         iflags.save_uinwater = u.uinwater, iflags.save_uburied = u.uburied;
         u.uinwater = u.uburied = 0;
         u.uswallow = 0;
+        if (iflags.save_uinwater || iflags.save_uburied)
+            docrt();
         default_glyph = cmap_to_glyph(level.flags.arboreal ? S_tree : S_stone);
         /* for 'full', show the actual terrain for the entire level,
            otherwise what the hero remembers for seen locations with