diff --git a/src/Generator/Generators/NAPI/NAPISources.cs b/src/Generator/Generators/NAPI/NAPISources.cs
index 5d8f0af7..5ba39d33 100644
--- a/src/Generator/Generators/NAPI/NAPISources.cs
+++ b/src/Generator/Generators/NAPI/NAPISources.cs
@@ -822,6 +822,11 @@ namespace CppSharp.Generators.Cpp
             DFSM = Minimize.MinimizeDFSM(DFSM);
 #endif
 
+            // The construction step above can result in unordered final states, so re-order them to
+            // make the following code generation steps easier.
+
+            DFSM.F = DFSM.F.OrderBy(f => f).ToList();
+
             return DFSM;
         }
 
diff --git a/src/Generator/Utils/FSM/DFSM.cs b/src/Generator/Utils/FSM/DFSM.cs
index 125ccef2..8e15c84c 100644
--- a/src/Generator/Utils/FSM/DFSM.cs
+++ b/src/Generator/Utils/FSM/DFSM.cs
@@ -9,7 +9,7 @@ namespace CppSharp.Utils.FSM
       public readonly List<char> Sigma = new List<char>();
       public readonly List<Transition> Delta = new List<Transition>();
       public List<string> Q0 = new List<string>();
-      public readonly List<string> F = new List<string>();
+      public List<string> F = new List<string>();
 
       public DFSM(IEnumerable<string> q, IEnumerable<char> sigma, IEnumerable<Transition> delta,
          IEnumerable<string> q0, IEnumerable<string> f){