diff --git a/lib/cli.py b/lib/cli.py
index bbdb62998d4762b480ebafbb3aad866a9855819a..340208ac28a08a9f973214b0573707d638022db0 100644
--- a/lib/cli.py
+++ b/lib/cli.py
@@ -384,7 +384,7 @@ def _SplitKeyVal(opt, data):
   """
   kv_dict = {}
   if data:
-    for elem in data.split(","):
+    for elem in utils.UnescapeAndSplit(data, sep=","):
       if "=" in elem:
         key, val = elem.split("=", 1)
       else: