diff --git a/lib/extensions/input.py b/lib/extensions/input.py
index 826e7e04b..031488328 100644
--- a/lib/extensions/input.py
+++ b/lib/extensions/input.py
@@ -1,11 +1,12 @@
 import os
-from inkex import etree
-import inkex
 import pyembroidery
 
+from inkex import etree
+import inkex
+
+from ..stitch_plan import StitchPlan
 from ..svg import PIXELS_PER_MM, render_stitch_plan
 from ..svg.tags import INKSCAPE_LABEL
-from ..stitch_plan import StitchPlan
 
 
 class Input(object):
@@ -29,7 +30,7 @@ class Input(object):
                 if len(color_block) > 0 and command == pyembroidery.TRIM:
                     trim_after = True
 
-        stitch_plan.delete_empty_color_block(color_block)
+        stitch_plan.delete_empty_color_blocks()
 
         extents = stitch_plan.extents
         svg = etree.Element("svg", nsmap=inkex.NSS, attrib={
diff --git a/lib/stitch_plan/stitch_plan.py b/lib/stitch_plan/stitch_plan.py
index 0b12c2c55..59c54e3d9 100644
--- a/lib/stitch_plan/stitch_plan.py
+++ b/lib/stitch_plan/stitch_plan.py
@@ -1,8 +1,8 @@
+from ..svg import PIXELS_PER_MM
+from ..threads import ThreadColor
+from ..utils.geometry import Point
 from .stitch import Stitch
 from .ties import add_ties
-from ..svg import PIXELS_PER_MM
-from ..utils.geometry import Point
-from ..threads import ThreadColor
 
 
 def patches_to_stitch_plan(patches, collapse_len=3.0 * PIXELS_PER_MM):
@@ -72,9 +72,13 @@ class StitchPlan(object):
         self.color_blocks.append(color_block)
         return color_block
 
-    def delete_empty_color_block(self, color_block):
-        if len(color_block) == 0:
-            self.color_blocks.remove(color_block)
+    def delete_empty_color_blocks(self):
+        color_blocks = []
+        for color_block in self.color_blocks:
+            if len(color_block) > 0:
+                color_blocks.append(color_block)
+
+        self.color_block = color_blocks
 
     def add_color_block(self, color_block):
         self.color_blocks.append(color_block)