3 files changed, 9 insertions, 4 deletions

diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs
index 16517e91..31d0b3a6 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs
@@ -803,7 +803,10 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             row[1] = tuple.Name;
             row[2] = events;
             row[3] = tuple.Arguments;
-            row[4] = tuple.Wait;
+            if (tuple.Wait.HasValue)
+            {
+                row[4] =  tuple.Wait.Value ? 1 : 0;
+            }
             row[5] = tuple.ComponentRef;
         }
 
diff --git a/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs b/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
index 200ba7b8..18380417 100644
--- a/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
@@ -817,7 +817,7 @@ namespace WixToolsetTest.CoreIntegration
         }
 
         [Fact]
-        public void PopulatesServiceInstallTable()
+        public void PopulatesServiceTables()
         {
             var folder = TestData.Get(@"TestData");
 
@@ -841,9 +841,10 @@ namespace WixToolsetTest.CoreIntegration
                 result.AssertSuccess();
 
                 Assert.True(File.Exists(msiPath));
-                var results = Query.QueryDatabase(msiPath, new[] { "ServiceInstall" });
+                var results = Query.QueryDatabase(msiPath, new[] { "ServiceInstall", "ServiceControl" });
                 Assert.Equal(new[]
                 {
+                    "ServiceControl:SampleService\tSampleService\t161\t\t1\ttest.txt",
                     "ServiceInstall:SampleService\tSampleService\t\t16\t4\t0\t\t\t\t\t\ttest.txt\t",
                 }, results);
             }
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ServiceInstall/OwnProcess.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/ServiceInstall/OwnProcess.wxs
index 596e98a6..65cba20e 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ServiceInstall/OwnProcess.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/ServiceInstall/OwnProcess.wxs
@@ -4,7 +4,8 @@
         <ComponentGroup Id="ProductComponents">
             <Component Directory="INSTALLFOLDER">
                 <File Id="test.txt" Source="test.txt" />
-                <ServiceInstall Name="SampleService" ErrorControl="ignore" Start="disabled" Type="ownProcess"></ServiceInstall>
+                <ServiceInstall Name="SampleService" ErrorControl="ignore" Start="disabled" Type="ownProcess" />
+                <ServiceControl Name="SampleService" Start="install" Stop="uninstall" Remove="uninstall" Wait="yes" />
             </Component>
         </ComponentGroup>
     </Fragment>