diff --git a/sites/all/modules/mailchimp/modules/mailchimp_lists/mailchimp_lists.module b/sites/all/modules/mailchimp/modules/mailchimp_lists/mailchimp_lists.module
index 2a1b41f..1313b10 100644
--- a/sites/all/modules/mailchimp/modules/mailchimp_lists/mailchimp_lists.module
+++ b/sites/all/modules/mailchimp/modules/mailchimp_lists/mailchimp_lists.module
@@ -440,7 +440,8 @@
           if (isset($memberinfo['merges']['GROUPINGS'])) {
             foreach($memberinfo['merges']['GROUPINGS'] as $membergroup) {
               if ($membergroup['id'] == $group['id']) {
-                $default_merge_values = explode(",", str_replace(', ', ',', $membergroup['groups']));
+                $default_merge_values = preg_split('#(?<!\\\)\,#',str_replace(', ', ',', $membergroup['groups']));
+                $default_merge_values = str_replace('\\,', ', ', $default_merge_values);
                 break;
               }
             }
@@ -509,6 +510,7 @@
       if (!empty($form_list['interest_groups'])) {
         $groupings = array();
         foreach($form_list['interest_groups'] as $key => $group) {
+          $group = preg_replace('/,/', '\,', $group);
           $groups = is_array($group) ? implode(',', array_filter($group)) : $group;
           $groupings[] = array('id' => $key, 'groups' => $groups);
         }