diff --git a/ChangeLog b/ChangeLog
index 6453fb0bd..860c49f1f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-23  Mike Kestner  <mkestner@ximian.com>
+
+	* generator/SignalHandler.cs : put back the ObjectGen hack
+	for param wrapping.  [Fixes #58876]
+
 2004-05-22  Mike Kestner  <mkestner@ximian.com>
 
 	* configure.in : require mono-0.91.99.  Sorry, but we need to
diff --git a/generator/SignalHandler.cs b/generator/SignalHandler.cs
index 58c5eef9a..cbb4d2c1c 100644
--- a/generator/SignalHandler.cs
+++ b/generator/SignalHandler.cs
@@ -146,7 +146,10 @@ namespace GtkSharp.Generation {
 						sw.WriteLine("\t\t\tif (arg{0} == IntPtr.Zero)", idx);
 						sw.WriteLine("\t\t\t\targs.Args[{0}] = null;", idx - 1);
 						sw.WriteLine("\t\t\telse {");
-						sw.WriteLine("\t\t\t\targs.Args[" + (idx-1) + "] = " + table.FromNative (ctype, "arg" + idx)  + ";");
+						if ((wrapper != null) && wrapper is ObjectGen)
+							sw.WriteLine("\t\t\t\targs.Args[" + (idx-1) + "] = GLib.Object.GetObject(arg" + idx + ");");
+						else
+							sw.WriteLine("\t\t\t\targs.Args[" + (idx-1) + "] = " + table.FromNative (ctype, "arg" + idx)  + ";");
 						sw.WriteLine("\t\t\t}");
 					} else {
 						sw.WriteLine("\t\t\targs.Args[" + (idx-1) + "] = " + table.FromNative (ctype, "arg" + idx)  + ";");