diff --git a/examples/rebind.html b/examples/rebind.html
index fb229b0..6ebc759 100644
--- a/examples/rebind.html
+++ b/examples/rebind.html
@@ -23,6 +23,12 @@
 
     <link rel="stylesheet" href="stylesheets/base.css" />
 
+    <style type="text/css">
+      button {
+        margin: 5px;
+      }
+    </style>
+
     <script type="text/javascript">
       $(document).ready(function () {
         'use strict';
@@ -34,7 +40,8 @@
 
         var $image = $('#beatles'),
           $log = $('#log'),
-          options = {
+          $ringo = $('#ringo'),
+          origOptions = {
             mapKey: 'data-name',
             wrapClass: 'wrapper',
             onConfigured: function () {
@@ -46,11 +53,61 @@
             }
           };
 
-        $('#rebind').on('click', function () {
+        $('#rebindexistingoptions').on('click', function () {
           $image.mapster('rebind', $image.mapster('get_options'));
         });
 
-        $image.mapster(options);
+        $('#rebindorigoptions').on('click', function () {
+          $image.mapster('rebind', origOptions);
+        });
+
+        $('#rebindwithnewoptions').on('click', function () {
+          $image.mapster(
+            'rebind',
+            $.extend({}, origOptions, {
+              areas: [
+                {
+                  key: 'paul',
+                  staticState: true
+                },
+                {
+                  key: 'george',
+                  selected: true
+                }
+              ]
+            })
+          );
+        });
+
+        $('#rebindpersistselected').on('click', function () {
+          var areas = $image
+            .mapster('get')
+            .split(',')
+            .map(function (key) {
+              return { key: key, selected: true };
+            });
+          $image.mapster('rebind', $.extend({}, origOptions, { areas: areas }));
+        });
+
+        $('#swapareakeys').on('click', function () {
+          $('area').each(function (_, area) {
+            var $area = $(area),
+              keys = $area.attr('data-name').split(',').reverse();
+            $area.attr('data-name', keys);
+          });
+          $image.mapster('rebind', $image.mapster('get_options'));
+        });
+
+        $('#changeringokeys').on('click', function () {
+          $ringo.attr('data-name', 'ringo');
+          $image.mapster('rebind', $image.mapster('get_options'));
+        });
+
+        $('#reset').on('click', function () {
+          $image.mapster('unbind').mapster(origOptions);
+        });
+
+        $image.mapster(origOptions);
       });
     </script>
   </head>
@@ -62,17 +119,29 @@
     </div>
     <h2>Rebind Test</h2>
     <p>
-      Test 'rebind' using various combinations of values. This should
-      be converted to a unit test once the testing framework is updated.
+      Test 'rebind' using various combinations of values. This should be
+      converted to a unit test once the testing framework is updated.
     </p>
     <p>The behavior should be:</p>
     <ul>
       <li>onConfigured should appear in log on page load</li>
       <li>onConfigured should be appended to log after rebind</li>
+      <li>
+        Rebind should apply configuration specified and not preserve selected
+        state
+      </li>
     </ul>
     <p>Selected Keys: <span id="selectedKeys"></span></p>
     <div>
-      <button id="rebind">Rebind</button>
+      <button id="rebindexistingoptions">Rebind Current Options</button>
+      <button id="rebindorigoptions">Rebind Original Options</button>
+      <button id="rebindwithnewoptions">Rebind Changed Options</button>
+      <button id="rebindpersistselected">Rebind Persist Selected</button>
+      <br />
+      <button id="swapareakeys">Swap Area Key Order</button>
+      <button id="changeringokeys">Change Ringo Keys</button>
+      <br />
+      <button id="reset">Reset Map</button>
     </div>
     <div>
       <img
@@ -86,28 +155,28 @@ <h2>Rebind Test</h2>
       <area
         id="paul"
         shape="rect"
-        data-name="paul"
+        data-name="paul,beatles"
         coords="36,46,121,131"
         href="#"
       />
       <area
         id="ringo"
         shape="rect"
-        data-name="ringo"
+        data-name="ringo,beatles"
         coords="113,76,198,161"
         href="#"
       />
       <area
         id="john"
         shape="rect"
-        data-name="john"
+        data-name="john,beatles"
         coords="192,50,277,135"
         href="#"
       />
       <area
         id="george"
         shape="rect"
-        data-name="george"
+        data-name="george,beatles"
         coords="262,60,347,145"
         href="#"
       />
diff --git a/src/mapdata.js b/src/mapdata.js
index 48b0dbc..59afefb 100644
--- a/src/mapdata.js
+++ b/src/mapdata.js
@@ -938,6 +938,7 @@
         if (rebind) {
           mapArea = me.mapAreas[$area.data('mapster') - 1];
           mapArea.configure(curKey);
+          mapArea.areaDataXref = [];
         } else {
           mapArea = new m.MapArea(me, area, curKey);
           me.mapAreas.push(mapArea);
@@ -1012,7 +1013,13 @@
       if (opts.boundList && opts.boundList.length > 0) {
         me.refreshBoundList(opts);
       }
-      me.redrawSelections();
+
+      if (rebind) {
+        me.graphics.removeSelections();
+        me.graphics.refreshSelections();
+      } else {
+        me.redrawSelections();
+      }
     },
     processCommandQueue: function () {
       var cur,
diff --git a/tests/migrated.tests.js b/tests/migrated.tests.js
index eacf968..b7dfe17 100644
--- a/tests/migrated.tests.js
+++ b/tests/migrated.tests.js
@@ -283,120 +283,152 @@ this.tests.push(
 
             // test rebind
             newOpts = $.extend({}, map.mapster('get_options'), {
-              singleSelect: true,
               onConfigured: getPromise('configured5').resolve
             });
             map.mapster('rebind', newOpts);
             getPromise('configured5').then(function () {
               a.collectionEquals(
-                map.mapster('get'),
                 'TX,AK',
-                'Rebind with singleSelect reverted to original state'
+                map.mapster('get'),
+                'Rebind reverted to configured state'
               );
 
-              map.mapster('set', true, 'MI');
-              a.equals(map.mapster('get'), 'MI', 'Single select worked.');
-
-              map.mapster('set_options', { isDeselectable: false });
-              $('area[state="MI"]').first().trigger('click');
+              map.mapster('set', true, 'OR');
+              selected = map.mapster('get', 'OR');
               a.equals(
-                map.mapster('get', 'MI'),
+                selected,
                 true,
-                'Cannot deselect single selected item with isDeselectable=false'
+                "Can select 'staticState=false' area with 'set'"
               );
 
-              $('area[state="UT"]').first().trigger('click');
-
-              a.equals(map.mapster('get'), 'UT', 'New single state selected');
-
-              map.mapster('set_options', {
-                singleSelect: false,
-                isDeselectable: true,
-                areas: [{ key: 'ME', isDeselectable: false }]
+              newOpts = $.extend({}, map.mapster('get_options'), {
+                singleSelect: true,
+                onConfigured: getPromise('configured6').resolve
+              });
+              map.mapster('rebind', newOpts);
+              getPromise('configured6').then(function () {
+                // Note - selected keys revert to original state due to
+                //        options being passed and not having anything to
+                //        due specifically with singleSelect.  Rebind
+                //        does not persist previously selected state
+                //        as of commit https://github.com/jamietre/ImageMapster/commit/3de37f3
+                //        so this test is asserting that areas selected
+                //        by configuration are selected even when
+                //        singleSelect === true
+                a.collectionEquals(
+                  'TX,AK',
+                  map.mapster('get'),
+                  'Rebind with singleSelect reverted to configured state'
+                );
+
+                map.mapster('set', true, 'MI');
+                a.equals(map.mapster('get'), 'MI', 'Single select worked.');
+
+                map.mapster('set_options', { isDeselectable: false });
+                $('area[state="MI"]').first().trigger('click');
+                a.equals(
+                  map.mapster('get', 'MI'),
+                  true,
+                  'Cannot deselect single selected item with isDeselectable=false'
+                );
+
+                $('area[state="UT"]').first().trigger('click');
+
+                a.equals(map.mapster('get'), 'UT', 'New single state selected');
+
+                map.mapster('set_options', {
+                  singleSelect: false,
+                  isDeselectable: true,
+                  areas: [{ key: 'ME', isDeselectable: false }]
+                });
+
+                $('area[state="UT"]').first().trigger('click');
+                a.equals(
+                  map.mapster('get', 'UT'),
+                  false,
+                  'Was able to deselect item after removing singleSelect'
+                );
+
+                map.mapster('set', true, 'CA,HI,ME');
+
+                $('area[state="ME"]').first().trigger('click');
+                a.equals(
+                  map.mapster('get', 'ME'),
+                  true,
+                  'Could not deselect one item marked as !isDeselectable'
+                );
+                $('area[state="CA"]').first().trigger('click');
+                a.equals(
+                  map.mapster('get', 'CA'),
+                  false,
+                  'Could deselect other items '
+                );
+
+                // Test manual highlighting
+
+                a.equals(
+                  map.mapster('highlight'),
+                  null,
+                  'nothing is highlighted'
+                );
+
+                $('area[state="CA"]').first().mapster('highlight');
+
+                a.equals(
+                  map.mapster('highlight'),
+                  'CA',
+                  'highlighted manually'
+                );
+
+                map.mapster('highlight', 'LA');
+
+                a.equals(
+                  map.mapster('highlight'),
+                  'LA',
+                  'highlighted manually using other technique'
+                );
+
+                map.mapster('highlight', false);
+
+                a.equals(
+                  map.mapster('highlight'),
+                  null,
+                  'everything unhighlighted'
+                );
+
+                // restore internal canvas setting or these tests won't work
+                // if (disableCanvas) {
+                //     map.mapster('test', 'has_canvas=true');
+                // } else {
+
+                //     // cleanup tests - skip to play with map afterwards
+                //     // return;
+
+                //     if (has_canvas) {
+                //         a.equals($('canvas').length, 2, 'There are 2 canvases.');
+                //         map.mapster(map_options);
+                //         a.equals($('canvas').length, 2, 'There are 2 canvases (recreate was clean)');
+                //     }
+                // }
+                map.mapster('unbind');
+                a.equals(
+                  $('canvas').length,
+                  0,
+                  'No canvases remain after an unbind.'
+                );
+
+                a.equals(
+                  $('#test_elements *').length,
+                  domCount,
+                  '# elements in DOM is the same.'
+                );
+
+                getPromise('finished').resolve();
+
+                // if (disableCanvas) {
+                //     $.mapster.hasCanvas=oldHasCanvas;
+                // }
               });
-
-              $('area[state="UT"]').first().trigger('click');
-              a.equals(
-                map.mapster('get', 'UT'),
-                false,
-                'Was able to deselect item after removing singleSelect'
-              );
-
-              map.mapster('set', true, 'CA,HI,ME');
-
-              $('area[state="ME"]').first().trigger('click');
-              a.equals(
-                map.mapster('get', 'ME'),
-                true,
-                'Could not deselect one item marked as !isDeselectable'
-              );
-              $('area[state="CA"]').first().trigger('click');
-              a.equals(
-                map.mapster('get', 'CA'),
-                false,
-                'Could deselect other items '
-              );
-
-              // Test manual highlighting
-
-              a.equals(
-                map.mapster('highlight'),
-                null,
-                'nothing is highlighted'
-              );
-
-              $('area[state="CA"]').first().mapster('highlight');
-
-              a.equals(map.mapster('highlight'), 'CA', 'highlighted manually');
-
-              map.mapster('highlight', 'LA');
-
-              a.equals(
-                map.mapster('highlight'),
-                'LA',
-                'highlighted manually using other technique'
-              );
-
-              map.mapster('highlight', false);
-
-              a.equals(
-                map.mapster('highlight'),
-                null,
-                'everything unhighlighted'
-              );
-
-              // restore internal canvas setting or these tests won't work
-              // if (disableCanvas) {
-              //     map.mapster('test', 'has_canvas=true');
-              // } else {
-
-              //     // cleanup tests - skip to play with map afterwards
-              //     // return;
-
-              //     if (has_canvas) {
-              //         a.equals($('canvas').length, 2, 'There are 2 canvases.');
-              //         map.mapster(map_options);
-              //         a.equals($('canvas').length, 2, 'There are 2 canvases (recreate was clean)');
-              //     }
-              // }
-              map.mapster('unbind');
-              a.equals(
-                $('canvas').length,
-                0,
-                'No canvases remain after an unbind.'
-              );
-
-              a.equals(
-                $('#test_elements *').length,
-                domCount,
-                '# elements in DOM is the same.'
-              );
-
-              getPromise('finished').resolve();
-
-              // if (disableCanvas) {
-              //     $.mapster.hasCanvas=oldHasCanvas;
-              // }
             });
           });
         });