diff --git a/clap_generate/examples/value_hints.rs b/clap_generate/examples/value_hints.rs
index 33f3ef3f461f..c50ac5ea3333 100644
--- a/clap_generate/examples/value_hints.rs
+++ b/clap_generate/examples/value_hints.rs
@@ -73,7 +73,7 @@ fn build_cli() -> App<'static> {
         )
         .arg(
             Arg::new("command_with_args")
-                .multiple_values(true)
+                .multiple(true)
                 .value_hint(ValueHint::CommandWithArguments),
         )
         .arg(
diff --git a/clap_generate/tests/value_hints.rs b/clap_generate/tests/value_hints.rs
index 83d55f30bcd4..2172280689f7 100644
--- a/clap_generate/tests/value_hints.rs
+++ b/clap_generate/tests/value_hints.rs
@@ -56,7 +56,7 @@ pub fn build_app_with_value_hints() -> App<'static> {
         )
         .arg(
             Arg::new("command_with_args")
-                .multiple_values(true)
+                .multiple(true)
                 .value_hint(ValueHint::CommandWithArguments),
         )
         .arg(
diff --git a/src/build/arg/mod.rs b/src/build/arg/mod.rs
index da8c41aa35d9..a4c35e9e3ab1 100644
--- a/src/build/arg/mod.rs
+++ b/src/build/arg/mod.rs
@@ -4233,8 +4233,9 @@ impl<'a> Arg<'a> {
 
             if self.value_hint == ValueHint::CommandWithArguments {
                 assert!(
-                    self.is_set(ArgSettings::MultipleValues),
-                    "Argument '{}' uses hint CommandWithArguments and must accept multiple values",
+                    self.is_set(ArgSettings::MultipleOccurrences)
+                        && self.is_set(ArgSettings::MultipleValues),
+                    "Argument '{}' uses hint CommandWithArguments and must use .multiple(true)",
                 )
             }
         }