diff --git a/overviewer_core/textures.py b/overviewer_core/textures.py
index 8c701da..8867726 100644
--- a/overviewer_core/textures.py
+++ b/overviewer_core/textures.py
@@ -94,8 +94,13 @@ class Textures(object):
     ##
     
     def __getstate__(self):
+        # we must get rid of the huge image lists, and other images
         attributes = self.__dict__.copy()
-        # Get rid of the jar list because file objects aren't pickleable like that
+        for attr in ['blockmap', 'biome_grass_texture', 'watertexture', 'lavatexture', 'firetexture', 'portaltexture', 'lightcolor', 'grasscolor', 'foliagecolor', 'watercolor', 'texture_cache']:
+            try:
+                del attributes[attr]
+            except KeyError:
+                pass
         attributes['jars'] = OrderedDict()
         return attributes
     def __setstate__(self, attrs):
@@ -103,7 +108,7 @@ class Textures(object):
         for attr, val in list(attrs.items()):
             setattr(self, attr, val)
         self.texture_cache = {}
-        if not self.generated:
+        if self.generated:
             self.generate()
     
     ##