diff --git a/H/ihstruct.h b/H/ihstruct.h
index a80fa5b07..56fff7295 100644
--- a/H/ihstruct.h
+++ b/H/ihstruct.h
@@ -191,7 +191,7 @@
 #ifdef TABLING
   InitOtaplInst(LOAD_ANSWER,_table_load_answer,PredFail);
   InitOtaplInst(TRY_ANSWER,_table_try_answer,PredFail);
-  InitOtaplInst(ANSWER_RESOLUTION,_answer_resolution,PredFail);
+  InitOtaplInst(ANSWER_RESOLUTION,_table_answer_resolution,PredFail);
   InitOtaplInst(COMPLETION,_table_completion,PredFail);
 #endif /* TABLING */
 
diff --git a/H/rhstruct.h b/H/rhstruct.h
index 7a0cb308e..4507baa94 100644
--- a/H/rhstruct.h
+++ b/H/rhstruct.h
@@ -189,9 +189,9 @@
   Yap_heap_regs->getwork_first_time->opc = Yap_opcode(_getwork_first_time);
 #endif /* YAPOR */
 #ifdef TABLING
-  RestoreOtaplInst(LOAD_ANSWER,_table_load_answer);
-  RestoreOtaplInst(TRY_ANSWER,_table_try_answer,PredFail,PredFail);
-  RestoreOtaplInst(ANSWER_RESOLUTION,_answer_resolution,PredFail);
+  RestoreOtaplInst(LOAD_ANSWER,_table_load_answer,PredFail);
+  RestoreOtaplInst(TRY_ANSWER,_table_try_answer,PredFail);
+  RestoreOtaplInst(ANSWER_RESOLUTION,_table_answer_resolution,PredFail);
   RestoreOtaplInst(COMPLETION,_table_completion,PredFail);
 #endif /* TABLING */
 
diff --git a/misc/HEAPFIELDS b/misc/HEAPFIELDS
index 679ace24f..f8eadea4e 100644
--- a/misc/HEAPFIELDS
+++ b/misc/HEAPFIELDS
@@ -208,9 +208,9 @@ int		seq_def			SEQUENTIAL_IS_DEFAULT	=TRUE void
 yamop		getwork_first_time[1]	GETWORK_FIRST_TIME	MkInstE _getwork_first_time
 #endif /* YAPOR */
 #ifdef TABLING
-  yamop		table_load_answer_code[1] LOAD_ANSWER		InitOtaplInst(LOAD_ANSWER,_table_load_answer,PredFail) RestoreOtaplInst(LOAD_ANSWER,_table_load_answer)
-  yamop		table_try_answer_code[1] TRY_ANSWER		InitOtaplInst(TRY_ANSWER,_table_try_answer,PredFail) RestoreOtaplInst(TRY_ANSWER,_table_try_answer,PredFail,PredFail)
-  yamop		table_answer_resolution_code[1]	ANSWER_RESOLUTION InitOtaplInst(ANSWER_RESOLUTION,_answer_resolution,PredFail) RestoreOtaplInst(ANSWER_RESOLUTION,_answer_resolution,PredFail)
+  yamop		table_load_answer_code[1] LOAD_ANSWER		InitOtaplInst(LOAD_ANSWER,_table_load_answer,PredFail) RestoreOtaplInst(LOAD_ANSWER,_table_load_answer,PredFail)
+  yamop		table_try_answer_code[1] TRY_ANSWER		InitOtaplInst(TRY_ANSWER,_table_try_answer,PredFail) RestoreOtaplInst(TRY_ANSWER,_table_try_answer,PredFail)
+  yamop		table_answer_resolution_code[1]	ANSWER_RESOLUTION InitOtaplInst(ANSWER_RESOLUTION,_table_answer_resolution,PredFail) RestoreOtaplInst(ANSWER_RESOLUTION,_table_answer_resolution,PredFail)
 yamop		table_completion_code[1]	COMPLETION	InitOtaplInst(COMPLETION,_table_completion,PredFail) RestoreOtaplInst(COMPLETION,_table_completion,PredFail)
 #endif /* TABLING */