diff --git a/CHANGES.current b/CHANGES.current
index ada7461ac..e69c7d1dc 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -5,6 +5,10 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 2.0.8 (in progress)
 ===========================
 
+2012-08-05: wsfulton
+            [C#] Fix #3536360 - Invalid code sometimes being generated for director methods
+            with many arguments.
+
 2012-08-05: wsfulton
             [Perl] #3545877 - Don't undefine bool if defined by C99 stdbool.h - problem using 
             Perl 5.16 and later.
diff --git a/Examples/test-suite/director_classes.i b/Examples/test-suite/director_classes.i
index 5581c755f..7183e3d0a 100644
--- a/Examples/test-suite/director_classes.i
+++ b/Examples/test-suite/director_classes.i
@@ -108,3 +108,20 @@ public:
 
 %}
 
+
+%feature(director) BaseClass;
+%feature(director) DerivedClass;
+
+%inline %{
+class BaseClass
+{
+public:
+virtual ~BaseClass() {};
+virtual int dofoo(int& one, int& two, int& three) {return 0;}
+};
+
+class DerivedClass : public BaseClass
+{
+};
+%}
+
diff --git a/Source/Modules/csharp.cxx b/Source/Modules/csharp.cxx
index 57d050cde..18b8892cf 100644
--- a/Source/Modules/csharp.cxx
+++ b/Source/Modules/csharp.cxx
@@ -3728,7 +3728,6 @@ public:
       Delete(ln);
       Delete(arg);
       Delete(c_decl);
-      Delete(c_param_type);
     }
 
     /* header declaration, start wrapper definition */