1 files changed, 7 insertions, 3 deletions
diff --git a/mcs/class/corlib/System.Reflection.Emit/GenericTypeParameterBuilder.cs b/mcs/class/corlib/System.Reflection.Emit/GenericTypeParameterBuilder.cs
index b668caa3b37..7df715b59ce 100644
--- a/mcs/class/corlib/System.Reflection.Emit/GenericTypeParameterBuilder.cs
+++ b/mcs/class/corlib/System.Reflection.Emit/GenericTypeParameterBuilder.cs
@@ -289,11 +289,13 @@ namespace System.Reflection.Emit
 		}
 
 		public override Type DeclaringType {
-			get { return mbuilder != null ? mbuilder.DeclaringType : tbuilder; }
+			get { return mbuilder != null ? null : tbuilder; }
 		}
 
 		public override Type ReflectedType {
-			get { return DeclaringType; }
+			get {
+				return DeclaringType;
+			}
 		}
 
 		public override RuntimeTypeHandle TypeHandle {
@@ -352,7 +354,9 @@ namespace System.Reflection.Emit
 		}
 
 		public override MethodBase DeclaringMethod {
-			get { return mbuilder; }
+			get { 
+				return mbuilder;
+			}
 		}
 
 		public void SetCustomAttribute (CustomAttributeBuilder customBuilder)