diff --git a/CHANGES b/CHANGES
index 516af09b66..0314533751 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+ 580.	[bug]		In lib/dns/resolver.c, an INSIST was triggered
+			in fctx_getaddresses() when restarting with
+			returnlame.
+
  579.	[bug]		nsupdate did not take a filename to read update from.
 			[RT #492]
 
diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 1cec7ac29e..a77627dfda 100644
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: resolver.c,v 1.183 2000/11/22 23:16:04 bwelling Exp $ */
+/* $Id: resolver.c,v 1.184 2000/11/27 19:56:16 halley Exp $ */
 
 #include <config.h>
 
@@ -1535,6 +1535,7 @@ fctx_getaddresses(fetchctx_t *fctx) {
 			INSIST((stdoptions & DNS_ADBFIND_RETURNLAME) == 0);
 			stdoptions |= DNS_ADBFIND_RETURNLAME;
 			pruned = ISC_FALSE;
+			fctx_cleanupfinds(fctx);
 			goto restart;
 		} else {
 			/*