diff --git a/src/CodeGenHelpers/ParameterizedExtensions.cs b/src/CodeGenHelpers/ParameterizedExtensions.cs
index 417ce4a..f7289c1 100644
--- a/src/CodeGenHelpers/ParameterizedExtensions.cs
+++ b/src/CodeGenHelpers/ParameterizedExtensions.cs
@@ -114,7 +114,7 @@ public static T AddParameters<T>(this IParameterized<T> parameterized, IEnumerab
         private static T AddParameterInternal<T>(this IParameterized<T> parameterized, ParameterBuilder<T> parameter, int index)
             where T : BuilderBase<T>, IParameterized<T>
         {
-            if (parameterized.Parameters.Any(p => p == parameter))
+            if (parameterized.Parameters.Any(p => p.Type == parameter.Type && p.Name == parameter.Name))
                 return parameterized.Parent;
 
             if (index > -1)
diff --git a/src/CodeGenHelpers/SwitchBuilder.cs b/src/CodeGenHelpers/SwitchBuilder.cs
index 1814212..b46545e 100644
--- a/src/CodeGenHelpers/SwitchBuilder.cs
+++ b/src/CodeGenHelpers/SwitchBuilder.cs
@@ -13,6 +13,8 @@ public sealed class SwitchBuilder
         internal SwitchBuilder(ICodeWriter writer, string switchOn, bool expression)
         {
             _writer = writer;
+            _switchOn = switchOn;
+            Expression = expression;
         }
 
         public SwitchCaseBuilder AddCase(string @case)