diff --git a/.gitattributes b/.gitattributes
index cd6bdf4b87..fa9fa87760 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -13097,6 +13097,8 @@ tests/tbs/tb0665.pp svneol=native#text/pascal
 tests/tbs/tb0666a.pp svneol=native#text/pascal
 tests/tbs/tb0666b.pp svneol=native#text/pascal
 tests/tbs/tb0667.pp svneol=native#text/pascal
+tests/tbs/tb0668a.pp svneol=native#text/pascal
+tests/tbs/tb0668b.pp svneol=native#text/pascal
 tests/tbs/ub0060.pp svneol=native#text/plain
 tests/tbs/ub0069.pp svneol=native#text/plain
 tests/tbs/ub0119.pp svneol=native#text/plain
diff --git a/compiler/pexpr.pas b/compiler/pexpr.pas
index 97a07bd658..250c96c668 100644
--- a/compiler/pexpr.pas
+++ b/compiler/pexpr.pas
@@ -3011,11 +3011,11 @@ implementation
                wasgenericdummy:=false;
                if assigned(srsym) and
                    (sp_generic_dummy in srsym.symoptions) and
+                   (srsym.typ=typesym) and
                    (
                      (
                        (m_delphi in current_settings.modeswitches) and
                        not (token in [_LT, _LSHARPBRACKET]) and
-                       (srsym.typ=typesym) and
                        (ttypesym(srsym).typedef.typ=undefineddef)
                      )
                      or
diff --git a/tests/tbs/tb0668a.pp b/tests/tbs/tb0668a.pp
new file mode 100644
index 0000000000..9c21d6bc2c
--- /dev/null
+++ b/tests/tbs/tb0668a.pp
@@ -0,0 +1,20 @@
+{ %NORUN }
+
+program tb0668a;
+
+{$mode objfpc}
+
+procedure FreeAndNil(var Obj);
+begin
+end;
+
+generic procedure FreeAndNil<T: class>(var Obj: T);
+begin
+end;
+
+var
+  t: TObject;
+begin
+  FreeAndNil(t);
+  specialize FreeAndNil<TObject>(t);
+end.
diff --git a/tests/tbs/tb0668b.pp b/tests/tbs/tb0668b.pp
new file mode 100644
index 0000000000..98136e3d70
--- /dev/null
+++ b/tests/tbs/tb0668b.pp
@@ -0,0 +1,20 @@
+{ %NORUN }
+
+program tb0668b;
+
+{$mode objfpc}
+
+generic procedure FreeAndNil<T: class>(var Obj: T);
+begin
+end;
+
+procedure FreeAndNil(var Obj);
+begin
+end;
+
+var
+  t: TObject;
+begin
+  FreeAndNil(t);
+  specialize FreeAndNil<TObject>(t);
+end.