diff --git a/Build/obs--shaders.build.ps1 b/Build/obs--shaders.build.ps1
index 377582d90..7788384f1 100644
--- a/Build/obs--shaders.build.ps1
+++ b/Build/obs--shaders.build.ps1
@@ -53,7 +53,7 @@ if (-not (Test-Path $ShaderCommandsPath))  {
     $null = New-Item -ItemType Directory -path $ShaderCommandsPath
 }
 
-$FindShaderParameters = '^[^/]{0,}uniform\s{1,}(?<Type>\S+)\s{1,}(?<ParameterName>[\S-[\<\;]]+)'
+$FindShaderParameters = '[^/]{0,}uniform\s{1,}(?<Type>\S+)\s{1,}(?<ParameterName>[\S-[\<\;]]+)'
 
 $AllShaderParameters = $ShaderFiles | 
     Select-String $FindShaderParameters
@@ -127,7 +127,7 @@ Processing $($shaderParameterInSet | Out-String)
                 Out-File -Path $env:GITHUB_STEP_SUMMARY -Append
         }
 
-        $shaderMatch = "$(@($shaderParameterInSet.Matches()))" -match $FindShaderParameters
+        $shaderMatch = "$(@("$($shaderParameterInSet)") -join '')" -match $FindShaderParameters
         $shaderMatch = [Ordered]@{} + $matches
         $shaderParameterSystemName = $shaderMatch.ParameterName