diff --git a/bin/Lib/PABCSystem.pas b/bin/Lib/PABCSystem.pas
index 66615463a..0a3b7a5c6 100644
--- a/bin/Lib/PABCSystem.pas
+++ b/bin/Lib/PABCSystem.pas
@@ -4819,7 +4819,7 @@ begin
     exit;
   end;
   
-  if t.FullName.StartsWith('PABCSystem.NewSet`1') then
+  if t.IsGenericType and (t.GetGenericTypeDefinition = typeof(NewSet<>)) then
   begin
     res.Write('set of ');
     TypeToTypeNameHelper(t.GetGenericArguments.Single, res);