diff --git a/oop/ChangeLog b/oop/ChangeLog
index 085e5918f..07b756642 100644
--- a/oop/ChangeLog
+++ b/oop/ChangeLog
@@ -1,3 +1,10 @@
+2003-04-19  Mikael Djurfeldt  <djurfeldt@nada.kth.se>
+
+	* goops/dispatch.scm (cache-hashval): Corrected termination
+	condition for hashval computation.  (Previously, it made erroneous
+	assumptions about the representation of environments; Thanks to
+	Andreas Rottmann.)
+	
 2003-04-17  Mikael Djurfeldt  <djurfeldt@nada.kth.se>
 
 	* goops.scm (eqv?, equal?): Provide default methods for `eqv?' and
diff --git a/oop/goops/dispatch.scm b/oop/goops/dispatch.scm
index 549ceb6b8..125d0e6ae 100644
--- a/oop/goops/dispatch.scm
+++ b/oop/goops/dispatch.scm
@@ -1,4 +1,4 @@
-;;;; 	Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+;;;; 	Copyright (C) 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
 ;;;; 
 ;;;; This program is free software; you can redistribute it and/or modify
 ;;;; it under the terms of the GNU General Public License as published by
@@ -197,13 +197,11 @@
 ;;; Caching
 ;;;
 
-(define environment? pair?)
-
 (define (cache-hashval hashset entry)
   (let ((hashset-index (+ hashset-index hashset)))
     (do ((sum 0)
 	 (classes entry (cdr classes)))
-	((environment? (car classes)) sum)
+	((not (struct? (car classes))) sum)
       (set! sum (+ sum (struct-ref (car classes) hashset-index))))))
 
 (define (cache-try-hash! min-misses hashset cache entries)