diff --git a/ChangeLog b/ChangeLog
index ca715634e..97914f8b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-31  Rachel Hestilow  <hestilow@ximian.com>
+
+	* generator/Method.cs: Re-enable "if null then new" behavior
+	for Opaques.
+	
 2002-08-29  Rachel Hestilow  <hestilow@ximian.com>
 
 	* glib/DelegateWrapper.cs: Forgot to add this.
diff --git a/generator/Method.cs b/generator/Method.cs
index 97618fd4d..c514bb643 100644
--- a/generator/Method.cs
+++ b/generator/Method.cs
@@ -384,7 +384,8 @@ namespace GtkSharp.Generation {
 				{
 					sw.WriteLine(m_ret + " raw_ret = " + cname + call + ";");
 					sw.WriteLine(indent +"\t\t\t" + s_ret + " ret = " + SymbolTable.FromNativeReturn(rettype, "raw_ret") + ";");
-					// sw.WriteLine(indent + "\t\t\tif (ret == null) ret = new " + s_ret + "(raw_ret);");
+					if (SymbolTable.IsOpaque (rettype))
+						sw.WriteLine(indent + "\t\t\tif (ret == null) ret = new " + s_ret + "(raw_ret);");
 				}
 				else {
 					sw.WriteLine(m_ret + " raw_ret = " + cname + call + ";");