diff --git a/src/Generator/Passes/GetterSetterToPropertyAdvancedPass.cs b/src/Generator/Passes/GetterSetterToPropertyAdvancedPass.cs
index b6a2b980..899b86dd 100644
--- a/src/Generator/Passes/GetterSetterToPropertyAdvancedPass.cs
+++ b/src/Generator/Passes/GetterSetterToPropertyAdvancedPass.cs
@@ -25,7 +25,7 @@ namespace CppSharp.Passes
             {
                 this.log = log;
                 foreach (var method in @class.Methods.Where(
-                    m => !m.IsConstructor && !m.IsDestructor && !m.IsOperator))
+                    m => !m.IsConstructor && !m.IsDestructor && !m.IsOperator && m.IsGenerated))
                     DistributeMethod(method);
             }
 
diff --git a/tests/CSharpTemp/CSharpTemp.cpp b/tests/CSharpTemp/CSharpTemp.cpp
index f2c1e3f2..17cbee4e 100644
--- a/tests/CSharpTemp/CSharpTemp.cpp
+++ b/tests/CSharpTemp/CSharpTemp.cpp
@@ -257,3 +257,13 @@ void HasPrivateOverrideBase::privateOverride(int i)
 void HasPrivateOverride::privateOverride(int i)
 {
 }
+
+IgnoredType<int> PropertyWithIgnoredType::ignoredType()
+{
+    return _ignoredType;
+}
+
+void PropertyWithIgnoredType::setIgnoredType(const IgnoredType<int> &value)
+{
+    _ignoredType = value;
+}
diff --git a/tests/CSharpTemp/CSharpTemp.h b/tests/CSharpTemp/CSharpTemp.h
index bcce5810..3d64d403 100644
--- a/tests/CSharpTemp/CSharpTemp.h
+++ b/tests/CSharpTemp/CSharpTemp.h
@@ -216,3 +216,17 @@ class DLL_API AbstractWithProperty
 public:
     virtual int property() = 0;
 };
+
+template <typename T>
+class DLL_API IgnoredType
+{
+};
+
+class DLL_API PropertyWithIgnoredType
+{
+public:
+    IgnoredType<int> ignoredType();
+    void setIgnoredType(const IgnoredType<int>& value);
+private:
+    IgnoredType<int> _ignoredType;
+};