--- old/modules/controls/src/main/java/javafx/scene/chart/XYChart.java	2016-07-27 13:44:30.813292000 +0300
+++ new/modules/controls/src/main/java/javafx/scene/chart/XYChart.java	2016-07-27 13:44:30.589279100 +0300
@@ -137,8 +137,6 @@
             for (Series<X,Y> s : c.getRemoved()) {
                 s.setToRemove = true;
                 seriesRemoved(s);
-                int idx = seriesColorMap.remove(s);
-                colorBits.clear(idx);
             }
 
             for(int i=c.getFrom(); i<c.getTo() && !c.wasPermutated(); i++) {
@@ -883,6 +881,8 @@
         if (series != null) series.setToRemove = false;
         series.setChart(null);
         displayedSeries.remove(series);
+        int idx = seriesColorMap.remove(series);
+        colorBits.clear(idx);
     }
 
     /**