diff --git a/src/main/java/com/afwsamples/testdpc/ShellCommand.java b/src/main/java/com/afwsamples/testdpc/ShellCommand.java
index 95adac25..255ecc2b 100644
--- a/src/main/java/com/afwsamples/testdpc/ShellCommand.java
+++ b/src/main/java/com/afwsamples/testdpc/ShellCommand.java
@@ -145,7 +145,7 @@ public void run() {
         KeyValue.class,
         (string, validator) -> {
           if (string.contains("=")) {
-            String[] parts = string.split("=");
+            String[] parts = string.split("=", 2);
             return validator.valid(
                 new KeyValue(parts.length > 0 ? parts[0] : "", parts.length > 1 ? parts[1] : ""));
           }