diff --git a/H/amiops.h b/H/amiops.h
index 2498a0e17..ec4818797 100644
--- a/H/amiops.h
+++ b/H/amiops.h
@@ -267,9 +267,9 @@ Binding Macros for Multiple Assignment Variables.
 #define REF_TO_TRENTRY(REF)    AbsPair(((CELL *)&((REF)->Flags)))
 #define CLREF_TO_TRENTRY(REF)  AbsPair(((CELL *)&((REF)->ClFlags)))
 
-#define TRAIL_REF(REF)         TrailTerm(TR++) = REF_TO_TRENTRY(REF)
-#define TRAIL_CLREF(REF)       TrailTerm(TR++) = CLREF_TO_TRENTRY(REF)
-#define TRAIL_LINK(REF)        TrailTerm(TR++) = AbsPair((CELL *)(REF))
+#define TRAIL_REF(REF)         RESET_VARIABLE(&TrailVal(TR)), TrailTerm(TR++) = REF_TO_TRENTRY(REF)
+#define TRAIL_CLREF(REF)       RESET_VARIABLE(&TrailVal(TR)), TrailTerm(TR++) = CLREF_TO_TRENTRY(REF)
+#define TRAIL_LINK(REF)        RESET_VARIABLE(&TrailVal(TR)), TrailTerm(TR++) = AbsPair((CELL *)(REF))
 #define TRAIL_FRAME(FR)        DO_TRAIL(AbsPair((CELL *)(Yap_TrailBase)), FR)
 
 extern void	Yap_WakeUp(CELL *v);
diff --git a/packages/YapR b/packages/YapR
index 5c2419f04..90a2cd308 160000
--- a/packages/YapR
+++ b/packages/YapR
@@ -1 +1 @@
-Subproject commit 5c2419f04dcd32f6929be1785621ed57918af1a4
+Subproject commit 90a2cd3082694f77d9ac5568b0f9d57cb7c27af5