diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a4603f8..7517173 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,7 +10,7 @@ on:
       version:
         description: 'Build & package version'
         required: true
-        default: 0.1.2
+        default: 0.1.3
         type: string
 jobs:
   Build:
diff --git a/MsiZapEx/ComponentInfo.cs b/MsiZapEx/ComponentInfo.cs
index 35bce61..eae2c34 100644
--- a/MsiZapEx/ComponentInfo.cs
+++ b/MsiZapEx/ComponentInfo.cs
@@ -103,7 +103,7 @@ internal static List<ComponentInfo> GetComponents(Guid productCode, bool machine
         {
             GetAllComponents();
             List<ComponentInfo> components = new List<ComponentInfo>();
-            components.AddRange(_components.FindAll(ci => ci.MachineScope == machineContext && ci.ProductsKeyPath.Any(p => p.ProductCode.Equals(productCode))));
+            components.AddRange(_components.FindAll(ci => ci.ProductsKeyPath.Any(p => p.ProductCode.Equals(productCode))));
             return components;
         }
 
diff --git a/MsiZapEx/ProductInfo.cs b/MsiZapEx/ProductInfo.cs
index f9ed6f8..466bd47 100644
--- a/MsiZapEx/ProductInfo.cs
+++ b/MsiZapEx/ProductInfo.cs
@@ -181,7 +181,7 @@ public static List<ProductInfo> GetOrphanProducts()
                     ProductInfo pi = products.FirstOrDefault(p => p.ProductCode.Equals(keyPath.ProductCode));
                     if (pi == null)
                     {
-                        pi = new ProductInfo(keyPath.ProductCode);
+                        pi = new ProductInfo(keyPath.ProductCode, ci.MachineScope);
                         products.Add(pi);
                     }
                 }