diff --git a/compiler/pdecvar.pas b/compiler/pdecvar.pas
index f5a435bb4f..5aeb1b7fa3 100644
--- a/compiler/pdecvar.pas
+++ b/compiler/pdecvar.pas
@@ -1773,8 +1773,10 @@ implementation
                      fieldvs:=tfieldvarsym(sc[i]);
                      fieldvs.visibility:=visibility;
                      hstaticvs:=make_field_static(recst,fieldvs);
-                     if not parse_generic then
-                       cnodeutils.insertbssdata(hstaticvs);
+                     { for generics it would be better to disable the following,
+                       but simply disabling it in that case breaks linking with
+                       debug info }
+                     cnodeutils.insertbssdata(hstaticvs);
                      if vd_final in options then
                        hstaticvs.varspez:=vs_final;
                    end;