diff --git a/src/c/eval.d b/src/c/eval.d
index 4c3ac74df..debf28579 100644
--- a/src/c/eval.d
+++ b/src/c/eval.d
@@ -154,13 +154,15 @@ _ecl_link_call(cl_object sym, cl_objectfn *pLK, cl_object cblock, int narg, cl_v
 	case t_instance:
 		switch (fun->instance.isgf) {
 		case ECL_STANDARD_DISPATCH:
-			return _ecl_standard_dispatch(frame, fun);
+			out = _ecl_standard_dispatch(frame, fun);
+			break;
 		case ECL_USER_DISPATCH:
 			fun = fun->instance.slots[fun->instance.length - 1];
+			goto AGAIN;
 		default:
 			FEinvalid_function(fun);
 		}
-		goto AGAIN;
+		break;
 #endif /* CLOS */
 	case t_cclosure:
 		out = APPLY_closure(narg, fun->cclosure.entry,
diff --git a/src/lsp/config.lsp.in b/src/lsp/config.lsp.in
index d8df84ce3..30fc4cc6e 100644
--- a/src/lsp/config.lsp.in
+++ b/src/lsp/config.lsp.in
@@ -46,7 +46,7 @@ Returns, as a string, the location of the machine on which ECL runs."
 (defun lisp-implementation-version ()
   "Args:()
 Returns the version of your ECL as a string."
-  "@PACKAGE_VERSION@ (CVS 2008-05-07 11:23)")
+  "@PACKAGE_VERSION@ (CVS 2008-05-08 10:55)")
 
 (defun machine-type ()
   "Args: ()