diff --git a/Source/Editor/Editor.Build.cs b/Source/Editor/Editor.Build.cs
index 1c065cdd8..e76cb5dfe 100644
--- a/Source/Editor/Editor.Build.cs
+++ b/Source/Editor/Editor.Build.cs
@@ -40,7 +40,6 @@ public class Editor : EditorModule
         options.ScriptingAPI.SystemReferences.Add("System.Xml");
         options.ScriptingAPI.SystemReferences.Add("System.Xml.ReaderWriter");
         options.ScriptingAPI.SystemReferences.Add("System.Text.RegularExpressions");
-        options.ScriptingAPI.SystemReferences.Add("System.ComponentModel.TypeConverter");
         options.ScriptingAPI.SystemReferences.Add("System.IO.Compression.ZipFile");
 
         // Enable optimizations for Editor, disable this for debugging the editor
diff --git a/Source/Engine/Level/Tags.cs b/Source/Engine/Level/Tags.cs
index 3a25a8efa..3c1bb2047 100644
--- a/Source/Engine/Level/Tags.cs
+++ b/Source/Engine/Level/Tags.cs
@@ -7,9 +7,7 @@ using System.Runtime.CompilerServices;
 
 namespace FlaxEngine
 {
-#if FLAX_EDITOR
     [TypeConverter(typeof(TypeConverters.TagConverter))]
-#endif
     partial struct Tag : IEquatable<Tag>, IEquatable<string>, IComparable, IComparable<Tag>, IComparable<string>
     {
         /// <summary>
@@ -254,7 +252,6 @@ namespace FlaxEngine
     }
 }
 
-#if FLAX_EDITOR
 namespace FlaxEngine.TypeConverters
 {
     internal class TagConverter : TypeConverter
@@ -291,4 +288,3 @@ namespace FlaxEngine.TypeConverters
         }
     }
 }
-#endif
diff --git a/Source/Tools/Flax.Build/Build/EngineModule.cs b/Source/Tools/Flax.Build/Build/EngineModule.cs
index 021a31f44..7fdb9de40 100644
--- a/Source/Tools/Flax.Build/Build/EngineModule.cs
+++ b/Source/Tools/Flax.Build/Build/EngineModule.cs
@@ -43,6 +43,7 @@ namespace Flax.Build
             options.ScriptingAPI.Defines.Add("FLAX");
             options.ScriptingAPI.Defines.Add("FLAX_ASSERTIONS");
             options.ScriptingAPI.FileReferences.Add(Utilities.RemovePathRelativeParts(Path.Combine(Globals.EngineRoot, "Source", "Platforms", "DotNet", "Newtonsoft.Json.dll")));
+            options.ScriptingAPI.SystemReferences.Add("System.ComponentModel.TypeConverter");
         }
     }
 }