--- a/src/context.cpp	Sat Aug 29 14:06:03 2009 -0700
+++ b/src/context.cpp	Sat Aug 29 22:46:48 2009 -0700
@@ -564,15 +564,11 @@
   }
 
   jsval rval;
-
-  // TODO: This assumes that a JSFunction * is actually a subclass of
-  // a JSObject *, which may or may not be regarded as an implementation
-  // detail.
   JSBool result;
   Py_BEGIN_ALLOW_THREADS;
-  result = JS_CallFunction(self->cx, obj->obj,
-                           (JSFunction *) fun->base.obj,
-                           argc, argv, &rval);
+  result = JS_CallFunctionValue(self->cx, obj->obj,
+                                OBJECT_TO_JSVAL(fun->base.obj),
+                                argc, argv, &rval);
   Py_END_ALLOW_THREADS;
 
   PyMem_Free(argv);