diff --git a/ChangeLog b/ChangeLog
index dd6fbd375..b10e1a2cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2000-10-04  Sven Wischnowsky  <wischnow@zsh.org>
 
+	* 12885: Src/Zle/zle_tricky.c: don't stop parsing too early when
+ 	completing inside a command substitution
+	
 	* 12884: Src/Zle/compcore.c: don't forget a displayed list when
  	starting menu completion
 	
diff --git a/Src/Zle/zle_tricky.c b/Src/Zle/zle_tricky.c
index f9ba965db..d6250ce23 100644
--- a/Src/Zle/zle_tricky.c
+++ b/Src/Zle/zle_tricky.c
@@ -1158,6 +1158,7 @@ get_comp_string(void)
 		line[ll + addedx] = '\0';
 	    }
 	    lexrestore();
+	    tt = NULL;
 	    goto start;
 	}
     }