diff --git a/latest/SqlCodeAnalysisRules.props b/latest/SqlCodeAnalysisRules.props
index 1e60f2d..5cc1090 100644
--- a/latest/SqlCodeAnalysisRules.props
+++ b/latest/SqlCodeAnalysisRules.props
@@ -1,7 +1,6 @@
 <Project>
     <PropertyGroup>
         <CodeAnalysisRules>-Microsoft.Rules.Data.SR0013; $(CodeAnalysisRules)</CodeAnalysisRules>
-        <CodeAnalysisRules>-Microsoft.Rules.Data.SR0015; $(CodeAnalysisRules)</CodeAnalysisRules>
         <CodeAnalysisRules>-SqlServer.Rules.SRD0001; $(CodeAnalysisRules)</CodeAnalysisRules>
         <CodeAnalysisRules>-SqlServer.Rules.SRD0002; $(CodeAnalysisRules)</CodeAnalysisRules>
         <CodeAnalysisRules>-SqlServer.Rules.SRD0006; $(CodeAnalysisRules)</CodeAnalysisRules>
diff --git a/latest/tSQLt.Edge/Private/tSQLt.Private_GetParametersWithTypes.sql b/latest/tSQLt.Edge/Private/tSQLt.Private_GetParametersWithTypes.sql
index 5387e0c..eb7be6f 100644
--- a/latest/tSQLt.Edge/Private/tSQLt.Private_GetParametersWithTypes.sql
+++ b/latest/tSQLt.Edge/Private/tSQLt.Private_GetParametersWithTypes.sql
@@ -74,6 +74,7 @@ BEGIN
         SET @_i_ = @_i_ + 1
     END
 
+    SET @Scalar = ISNULL(@Scalar, 0)
     SELECT
         @ParametersWithTypes = STRING_AGG
         (
@@ -88,6 +89,6 @@ BEGIN
             ', '
         ) WITHIN GROUP (ORDER BY parameter_id)
     FROM @Result
-    WHERE (@Scalar = 1 AND parameter_id > 0) OR ISNULL(@Scalar, 0) = 0
+    WHERE (@Scalar = 1 AND parameter_id > 0) OR @Scalar = 0
 END;
 GO
\ No newline at end of file