diff --git a/doc/fixes37.0 b/doc/fixes37.0
index c18e04a9d..b929cbf6d 100644
--- a/doc/fixes37.0
+++ b/doc/fixes37.0
@@ -722,6 +722,9 @@ attack feedback when using a bullwhip said "swing"; change to "lash"
 attack feedback for monster using polearm when adjacent said "thrust"; change
 	to "bash"
 apply runmode delay to multiturn actions, not just running
+if a giant carrying a boulder was on ice that melted, it could be killed
+	twice, first by drowning, then by boulder filling the resulting pool
+	when it dropped inventory before being removed from the map
 
 
 Fixes to 3.7.0-x Problems that Were Exposed Via git Repository
diff --git a/src/do.c b/src/do.c
index cde8a8e45..bcf8c8f0f 100644
--- a/src/do.c
+++ b/src/do.c
@@ -66,7 +66,15 @@ boulder_hits_pool(struct obj *otmp, int rx, int ry, boolean pushing)
             } else
                 levl[rx][ry].typ = ROOM, levl[rx][ry].flags = 0;
 
-            if ((mtmp = m_at(rx, ry)) != 0)
+            /* 3.7: normally DEADMONSTER() is used when traversing the fmon
+               list--dead monsters usually aren't still at specific map
+               locations; however, if ice melts causing a giant to drown,
+               that giant would still be on the map when it drops inventory;
+               if it was carrying a boulder which now fills the pool, 'mtmp'
+               will be dead here; killing it again would yield impossible
+               "dmonsfree: N removed doesn't match N+1 pending" when other
+               monsters have finished their current turn */
+            if ((mtmp = m_at(rx, ry)) != 0 && !DEADMONSTER(mtmp))
                 mondied(mtmp);
 
             if (ttmp)