diff --git a/Editor/ReactiveObjects/ParameterAssignerPass.cs b/Editor/ReactiveObjects/ParameterAssignerPass.cs
index 8e37e395..eb0e512f 100644
--- a/Editor/ReactiveObjects/ParameterAssignerPass.cs
+++ b/Editor/ReactiveObjects/ParameterAssignerPass.cs
@@ -136,10 +136,10 @@ namespace nadena.dev.modular_avatar.core.editor
                         }
                     }
 
-                    var type = mami.ExpressionParametersValueType;
-                    if (valueType == VRCExpressionParameters.ValueType.Bool || type == VRCExpressionParameters.ValueType.Float)
+                    var newValueType = mami.ExpressionParametersValueType;
+                    if (valueType == VRCExpressionParameters.ValueType.Bool || newValueType == VRCExpressionParameters.ValueType.Float)
                     {
-                        valueType = type;
+                        valueType = newValueType;
                     }
 
                     isSaved |= mami.isSaved;
diff --git a/Runtime/ModularAvatarMenuItem.cs b/Runtime/ModularAvatarMenuItem.cs
index bed3e531..b5fd5d31 100644
--- a/Runtime/ModularAvatarMenuItem.cs
+++ b/Runtime/ModularAvatarMenuItem.cs
@@ -174,27 +174,13 @@ namespace nadena.dev.modular_avatar.core
         }
 
         internal AnimatorControllerParameterType AnimatorControllerParameterType
-        {
-            get
+            => ExpressionParametersValueType switch
             {
-                // 0, 1
-                var type = AnimatorControllerParameterType.Bool;
-
-                // 2, 3, ..., (255)
-                if (Control.value > 1)
-                {
-                    type = AnimatorControllerParameterType.Int;
-                }
-
-                // (-1.0), ..., -0.1, 0.1, ..., 0.9
-                if (Control.value < 0 || Mathf.Abs(Control.value - Mathf.Round(Control.value)) > 0.01f)
-                {
-                    type = AnimatorControllerParameterType.Float;
-                }
-
-                return type;
-            }
-        }
+                VRCExpressionParameters.ValueType.Bool => AnimatorControllerParameterType.Bool,
+                VRCExpressionParameters.ValueType.Int => AnimatorControllerParameterType.Int,
+                VRCExpressionParameters.ValueType.Float => AnimatorControllerParameterType.Float,
+                _ => 0,
+            };
     }
 }