diff --git a/src/HexManiac.Core/Models/HardcodeTablesModel.cs b/src/HexManiac.Core/Models/HardcodeTablesModel.cs
index 52a9f810..09363ec3 100644
--- a/src/HexManiac.Core/Models/HardcodeTablesModel.cs
+++ b/src/HexManiac.Core/Models/HardcodeTablesModel.cs
@@ -1,7 +1,6 @@
 using HavenSoft.HexManiac.Core.Models.Runs;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.IO;
 using System.Linq;
 
 
@@ -515,6 +514,9 @@ namespace HavenSoft.HexManiac.Core.Models {
          if (name == MoveTutors) format = format.Replace("]15", "]128");
          if (name == TmMoves) format = format.Replace("]58", "]128");
 
+         // graphics.pokemon.type.map[width. height. xy:|t|:|x:|.|y::]data.pokemon.type.names+1+2
+         if (name == "graphics.pokemon.type.map") format = format.Replace("data.pokemon.type.names+1+5", "data.pokemon.type.names+1+2");
+
          // overworld sprites
          if (name == OverworldSprites) format = format.Replace("graphics.overworld.tablelength", "240");
 
diff --git a/src/HexManiac.Core/ViewModels/Tools/SpriteTool.cs b/src/HexManiac.Core/ViewModels/Tools/SpriteTool.cs
index efd8476e..0b685082 100644
--- a/src/HexManiac.Core/ViewModels/Tools/SpriteTool.cs
+++ b/src/HexManiac.Core/ViewModels/Tools/SpriteTool.cs
@@ -1696,7 +1696,12 @@ namespace HavenSoft.HexManiac.Core.ViewModels.Tools {
                }
             }
          }
-         fileSystem.SaveImage(pixels, palette);
+         try {
+            fileSystem.SaveImage(pixels, palette);
+         } catch (Exception) {
+            // failed to export - try again using the un-indexed system.
+            fileSystem.SaveImage(PixelData, PixelWidth);
+         }
       }
    }