Index: generic/nsf.c
===================================================================
diff -u -r8eb8f0692e858ee3b4a7f90d0e16bae6f835330f -r1f7ecfcf5b0643ce05b96405c77d5da7fe10268e
--- generic/nsf.c	(.../nsf.c)	(revision 8eb8f0692e858ee3b4a7f90d0e16bae6f835330f)
+++ generic/nsf.c	(.../nsf.c)	(revision 1f7ecfcf5b0643ce05b96405c77d5da7fe10268e)
@@ -17154,11 +17154,11 @@
  */
 
 static int
-GetObjectParameterDefinition(Tcl_Interp *interp, Tcl_Obj *procNameObj, NsfObject *object,
+GetObjectParameterDefinition(Tcl_Interp *interp, Tcl_Obj *procNameObj, NsfClass *class,
                              NsfParsedParam *parsedParamPtr) {
   int result;
   Tcl_Obj *rawConfArgs;
-  NsfParsedParam *clParsedParamPtr = object->cl->parsedParamPtr;
+  NsfParsedParam *clParsedParamPtr = class->parsedParamPtr;
 
   /*
    * Parameter definitions are cached in the class, for which
@@ -17188,11 +17188,11 @@
      * There is no parameter definition available, get a new one in
      * the the string representation.
      */
-    Tcl_Obj *methodObj = NsfMethodObj(object, NSF_o_objectparameter_idx);
+    Tcl_Obj *methodObj = NsfMethodObj(&class->object, NSF_c_objectparameter_idx);
 
     if (methodObj) {
       /* fprintf(stderr, "=== calling %s objectparameter\n", ObjectName(object));*/
-      result = CallMethod((ClientData) object, interp, methodObj,
+      result = CallMethod((ClientData) class, interp, methodObj,
 			  2, 0, NSF_CM_NO_PROTECT|NSF_CSC_IMMEDIATE);
 
       if (result == TCL_OK) {
@@ -17211,7 +17211,7 @@
 	  NsfParsedParam *ppDefPtr = NEW(NsfParsedParam);
 	  ppDefPtr->paramDefs = parsedParamPtr->paramDefs;
 	  ppDefPtr->possibleUnknowns = parsedParamPtr->possibleUnknowns;
-	  object->cl->parsedParamPtr = ppDefPtr;
+	  class->parsedParamPtr = ppDefPtr;
 	}
 	DECR_REF_COUNT(rawConfArgs);
       }
@@ -17366,7 +17366,7 @@
 #endif
 
   /* Get the object parameter definition */
-  result = GetObjectParameterDefinition(interp, objv[0], object, &parsedParam);
+  result = GetObjectParameterDefinition(interp, objv[0], object->cl, &parsedParam);
   if (result != TCL_OK || !parsedParam.paramDefs) {
     /*fprintf(stderr, "... nothing to do for method %s\n", ObjStr(objv[0]));*/
     goto configure_exit;