diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index 18ce92a23f..d244803b84 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -1318,11 +1318,14 @@ func checkExclusive(ctx *cli.Context, args ...interface{}) {
 		if i+1 < len(args) {
 			switch option := args[i+1].(type) {
 			case string:
-				// Extended flag, expand the name and shift the arguments
+				// Extended flag check, make sure value set doesn't conflict with passed in option
 				if ctx.String(flag.Names()[0]) == option {
 					name += "=" + option
+					set = append(set, "--"+name)
 				}
+				// shift arguments and continue
 				i++
+				continue
 
 			case cli.Flag:
 			default: