diff --git a/src/REstate.EntityFrameworkCore.Migrations.SqlServer/Migrations/20190411152735_NaturalStateName.cs b/src/REstate.EntityFrameworkCore.Migrations.SqlServer/Migrations/20190411152735_NaturalStateName.cs
index 04b878c..83c84ac 100644
--- a/src/REstate.EntityFrameworkCore.Migrations.SqlServer/Migrations/20190411152735_NaturalStateName.cs
+++ b/src/REstate.EntityFrameworkCore.Migrations.SqlServer/Migrations/20190411152735_NaturalStateName.cs
@@ -17,18 +17,17 @@ protected override void Up(MigrationBuilder migrationBuilder)
 
             if (migrationBuilder.ActiveProvider == SqlServer)
             {
-                migrationBuilder.Sql(@"UPDATE [dbo].[Machines] SET [NaturalStateName] = CAST(LEFT(JSON_VALUE([StateJson],'$.AssemblyQualifiedName'), CHARINDEX(',', JSON_VALUE([StateJson],'$.AssemblyQualifiedName')) - 1) AS VARCHAR(450))");
 
                 migrationBuilder.Sql(@"CREATE NONCLUSTERED INDEX IX_Machines_SchematicName_NaturalStateName_UpdatedTime
-ON [dbo].[Machines] ([SchematicName], [UpdatedTime], [NaturalStateName])
-INCLUDE ([MachineId], [CommitNumber], [StateJson], [SchematicBytes])");
+ON [dbo].[Machines] ([SchematicName] ASC, [UpdatedTime] ASC, [NaturalStateName] ASC)
+INCLUDE ([MachineId])");
             }
             else
             {
                 migrationBuilder.CreateIndex(
                     name: "IX_Machines_SchematicName_NaturalStateName_UpdatedTime",
                     table: "Machines",
-                    columns: new[] { "SchematicName", "NaturalStateName", "UpdatedTime" });
+                    columns: new[] { "SchematicName", "NaturalStateName", "UpdatedTime", "MachineId" });
             }
         }