diff --git a/lib/xembly/directives.rb b/lib/xembly/directives.rb
index 0b4eb02..5fe40f6 100644
--- a/lib/xembly/directives.rb
+++ b/lib/xembly/directives.rb
@@ -48,8 +48,9 @@ def length
     def self.map(text)
       cmd, tail = text.strip.split(/\s+/, 2)
       args = tail.strip
-        .split(/"\s*,\s*"|'\s*,\s*'/)
-        .map { |a| a.tr('\'"', '') }
+        .scan(/"([^"]+)"/)
+        .flatten
+        .map { |a| a.tr('"', '') }
       case cmd.upcase
       when 'ADD'
         Add.new(args[0])