diff --git generic/xotcl.c generic/xotcl.c
index 9e5e4da..489fb12 100644
--- generic/xotcl.c
+++ generic/xotcl.c
@@ -2320,12 +2320,12 @@ AutonameIncr(Tcl_Interp *interp, Tcl_Obj *name, XOTclObject *obj,
 XOTclCallStackContent *
 XOTclCallStackFindLastInvocation(Tcl_Interp *interp, int offset) {
   XOTclCallStack *cs = &RUNTIME_STATE(interp)->cs;
-  register XOTclCallStackContent *csc = cs->top;
+  register XOTclCallStackContent *csc = CallStackGetFrame(interp);
   int topLevel = csc->currentFramePtr ? Tcl_CallFrame_level(csc->currentFramePtr) : 0;
   int deeper = offset;
 
   /* skip through toplevel inactive filters, do this offset times */
-  for (csc=cs->top; csc > cs->content; csc--) {
+  for (csc=CallStackGetFrame(interp); csc > cs->content; csc--) {
       /* fprintf(stderr, "csc %p callType = %x, frameType = %x, offset=%d\n",
          csc,csc->callType,csc->frameType,offset); */
     if ((csc->callType & XOTCL_CSC_CALL_IS_NEXT) ||