diff --git a/DiscImageChef.Filesystems/APFS.cs b/DiscImageChef.Filesystems/APFS.cs
index d94da21dd..25d3b5a7d 100644
--- a/DiscImageChef.Filesystems/APFS.cs
+++ b/DiscImageChef.Filesystems/APFS.cs
@@ -54,8 +54,7 @@ namespace DiscImageChef.Filesystems
         {
             Name = "Apple File System";
             PluginUUID = new Guid("A4060F9D-2909-42E2-9D95-DB31FA7EA797");
-            if(encoding == null)
-                CurrentEncoding = Encoding.UTF8;
+            CurrentEncoding = Encoding.UTF8;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
diff --git a/DiscImageChef.Filesystems/Acorn.cs b/DiscImageChef.Filesystems/Acorn.cs
index ab663795a..d414ffaa2 100644
--- a/DiscImageChef.Filesystems/Acorn.cs
+++ b/DiscImageChef.Filesystems/Acorn.cs
@@ -79,6 +79,8 @@ namespace DiscImageChef.Filesystems
             PluginUUID = new Guid("BAFC1E50-9C64-4CD3-8400-80628CC27AFA");
             if(encoding == null)
                 CurrentEncoding = Encoding.GetEncoding("iso-8859-1");
+            else
+                CurrentEncoding = encoding;
         }
 
         /// <summary>
diff --git a/DiscImageChef.Filesystems/AmigaDOS.cs b/DiscImageChef.Filesystems/AmigaDOS.cs
index d7ce59c32..c7597a4f0 100644
--- a/DiscImageChef.Filesystems/AmigaDOS.cs
+++ b/DiscImageChef.Filesystems/AmigaDOS.cs
@@ -54,6 +54,8 @@ namespace DiscImageChef.Filesystems
             PluginUUID = new Guid("3c882400-208c-427d-a086-9119852a1bc7");
             if(encoding == null)
                 CurrentEncoding = Encoding.GetEncoding("iso-8859-1");
+            else
+                CurrentEncoding = encoding;
         }
 
         /// <summary>
diff --git a/DiscImageChef.Filesystems/AppleDOS/AppleDOS.cs b/DiscImageChef.Filesystems/AppleDOS/AppleDOS.cs
index 0930de1ee..6762b5433 100644
--- a/DiscImageChef.Filesystems/AppleDOS/AppleDOS.cs
+++ b/DiscImageChef.Filesystems/AppleDOS/AppleDOS.cs
@@ -86,8 +86,8 @@ namespace DiscImageChef.Filesystems.AppleDOS
             start = partition.Start;
             Name = "Apple DOS File System";
             PluginUUID = new Guid("8658A1E9-B2E7-4BCC-9638-157A31B0A700\n");
-            if(encoding == null) // TODO: Until Apple ][ encoding is implemented
-                CurrentEncoding = new Claunia.Encoding.LisaRoman();
+            // TODO: Until Apple ][ encoding is implemented
+            CurrentEncoding = new Claunia.Encoding.LisaRoman();
         }
     }
 }
diff --git a/DiscImageChef.Filesystems/AppleHFS.cs b/DiscImageChef.Filesystems/AppleHFS.cs
index b4b854a2a..dc9e81931 100644
--- a/DiscImageChef.Filesystems/AppleHFS.cs
+++ b/DiscImageChef.Filesystems/AppleHFS.cs
@@ -69,6 +69,8 @@ namespace DiscImageChef.Filesystems
             PluginUUID = new Guid("36405F8D-0D26-6ECC-0BBB-1D5225FF404F");
             if(encoding == null)
                 CurrentEncoding = Encoding.GetEncoding("macintosh");
+            else
+                CurrentEncoding = encoding;
         }
 
         public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
diff --git a/DiscImageChef.Filesystems/AppleHFSPlus.cs b/DiscImageChef.Filesystems/AppleHFSPlus.cs
index 82665c929..33d087447 100644
--- a/DiscImageChef.Filesystems/AppleHFSPlus.cs
+++ b/DiscImageChef.Filesystems/AppleHFSPlus.cs
@@ -59,15 +59,14 @@ namespace DiscImageChef.Filesystems
         {
             Name = "Apple HFS+ filesystem";
             PluginUUID = new Guid("36405F8D-0D26-6EBE-436F-62F0586B4F08");
-            CurrentEncoding = Encoding.UTF8;
+            CurrentEncoding = Encoding.BigEndianUnicode;
         }
 
         public AppleHFSPlus(ImagePlugins.ImagePlugin imagePlugin, Partition partition, Encoding encoding)
         {
             Name = "Apple HFS+ filesystem";
             PluginUUID = new Guid("36405F8D-0D26-6EBE-436F-62F0586B4F08");
-            if(encoding == null)
-                CurrentEncoding = Encoding.UTF8;
+            CurrentEncoding = Encoding.BigEndianUnicode;
         }
 
         public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
diff --git a/DiscImageChef.Filesystems/AppleMFS/AppleMFS.cs b/DiscImageChef.Filesystems/AppleMFS/AppleMFS.cs
index 8263da07d..5df94ebad 100644
--- a/DiscImageChef.Filesystems/AppleMFS/AppleMFS.cs
+++ b/DiscImageChef.Filesystems/AppleMFS/AppleMFS.cs
@@ -77,6 +77,8 @@ namespace DiscImageChef.Filesystems.AppleMFS
             partitionStart = partition.Start;
             if(encoding == null)
                 CurrentEncoding = Encoding.GetEncoding("macintosh");
+            else
+                CurrentEncoding = encoding;
         }
     }
 }
diff --git a/DiscImageChef.Filesystems/AtheOS.cs b/DiscImageChef.Filesystems/AtheOS.cs
index c9678ded7..e00ce5762 100644
--- a/DiscImageChef.Filesystems/AtheOS.cs
+++ b/DiscImageChef.Filesystems/AtheOS.cs
@@ -61,6 +61,8 @@ namespace DiscImageChef.Filesystems
             PluginUUID = new Guid("AAB2C4F1-DC07-49EE-A948-576CC51B58C5");
             if(encoding == null)
                 CurrentEncoding = Encoding.GetEncoding("iso-8859-15");
+            else
+                CurrentEncoding = encoding;
         }
 
         public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
diff --git a/DiscImageChef.Filesystems/BFS.cs b/DiscImageChef.Filesystems/BFS.cs
index d0f1a9c9d..bfd6c8031 100644
--- a/DiscImageChef.Filesystems/BFS.cs
+++ b/DiscImageChef.Filesystems/BFS.cs
@@ -66,6 +66,8 @@ namespace DiscImageChef.Filesystems
             PluginUUID = new Guid("dc8572b3-b6ad-46e4-8de9-cbe123ff6672");
             if(encoding == null)
                 CurrentEncoding = Encoding.GetEncoding("iso-8859-15");
+            else
+                CurrentEncoding = encoding;
         }
 
         public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
diff --git a/DiscImageChef.Filesystems/BTRFS.cs b/DiscImageChef.Filesystems/BTRFS.cs
index 20ddab93f..888850620 100644
--- a/DiscImageChef.Filesystems/BTRFS.cs
+++ b/DiscImageChef.Filesystems/BTRFS.cs
@@ -59,6 +59,8 @@ namespace DiscImageChef.Filesystems
             PluginUUID = new Guid("C904CF15-5222-446B-B7DB-02EAC5D781B3");
             if(encoding == null)
                 CurrentEncoding = Encoding.GetEncoding("iso-8859-15");
+            else
+                CurrentEncoding = encoding;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
diff --git a/DiscImageChef.Filesystems/CBM.cs b/DiscImageChef.Filesystems/CBM.cs
index 45994f73e..fbc19e54c 100644
--- a/DiscImageChef.Filesystems/CBM.cs
+++ b/DiscImageChef.Filesystems/CBM.cs
@@ -51,8 +51,7 @@ namespace DiscImageChef.Filesystems
         {
             Name = "Commodore file system";
             PluginUUID = new Guid("D104744E-A376-450C-BAC0-1347C93F983B");
-            if(encoding == null)
-                CurrentEncoding = new Claunia.Encoding.PETSCII();
+            CurrentEncoding = new Claunia.Encoding.PETSCII();
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
diff --git a/DiscImageChef.Filesystems/CPM/CPM.cs b/DiscImageChef.Filesystems/CPM/CPM.cs
index f8a4eacf0..46d17e477 100644
--- a/DiscImageChef.Filesystems/CPM/CPM.cs
+++ b/DiscImageChef.Filesystems/CPM/CPM.cs
@@ -125,6 +125,8 @@ namespace DiscImageChef.Filesystems.CPM
             PluginUUID = new Guid("AA2B8585-41DF-4E3B-8A35-D1A935E2F8A1");
             if(encoding == null)
                 CurrentEncoding = Encoding.GetEncoding("IBM437");
+            else
+                CurrentEncoding = encoding;
         }
     }
 }
diff --git a/DiscImageChef.Filesystems/Cram.cs b/DiscImageChef.Filesystems/Cram.cs
index e85f1aff7..99bb5764a 100644
--- a/DiscImageChef.Filesystems/Cram.cs
+++ b/DiscImageChef.Filesystems/Cram.cs
@@ -53,6 +53,8 @@ namespace DiscImageChef.Filesystems
             PluginUUID = new Guid("F8F6E46F-7A2A-48E3-9C0A-46AF4DC29E09");
             if(encoding == null)
                 CurrentEncoding = Encoding.GetEncoding("iso-8859-15");
+            else
+                CurrentEncoding = encoding;
         }
 
         enum CramCompression : ushort
diff --git a/DiscImageChef.Filesystems/ECMA67.cs b/DiscImageChef.Filesystems/ECMA67.cs
index c7d62cc49..990ad03c2 100644
--- a/DiscImageChef.Filesystems/ECMA67.cs
+++ b/DiscImageChef.Filesystems/ECMA67.cs
@@ -55,6 +55,8 @@ namespace DiscImageChef.Filesystems
             PluginUUID = new Guid("62A2D44A-CBC1-4377-B4B6-28C5C92034A1");
             if(encoding == null)
                 CurrentEncoding = Encoding.GetEncoding("iso-8859-1");
+            else
+                CurrentEncoding = encoding;
         }
 
         readonly byte[] ECMA67_Magic = { 0x56, 0x4F, 0x4C };
diff --git a/DiscImageChef.Filesystems/F2FS.cs b/DiscImageChef.Filesystems/F2FS.cs
index a07156b97..8eb0abfe0 100644
--- a/DiscImageChef.Filesystems/F2FS.cs
+++ b/DiscImageChef.Filesystems/F2FS.cs
@@ -120,8 +120,7 @@ namespace DiscImageChef.Filesystems
         {
             Name = "F2FS Plugin";
             PluginUUID = new Guid("82B0920F-5F0D-4063-9F57-ADE0AE02ECE5");
-            if(encoding == null)
-                CurrentEncoding = Encoding.Unicode;
+            CurrentEncoding = Encoding.Unicode;
         }
 
         public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
diff --git a/DiscImageChef.Filesystems/FAT.cs b/DiscImageChef.Filesystems/FAT.cs
index 12f41e826..0713284ea 100644
--- a/DiscImageChef.Filesystems/FAT.cs
+++ b/DiscImageChef.Filesystems/FAT.cs
@@ -55,6 +55,8 @@ namespace DiscImageChef.Filesystems
             PluginUUID = new Guid("33513B2C-0D26-0D2D-32C3-79D8611158E0");
             if(encoding == null)
                 CurrentEncoding = Encoding.GetEncoding("IBM437");
+            else
+                CurrentEncoding = encoding;
         }
 
         public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
diff --git a/DiscImageChef.Filesystems/FATX.cs b/DiscImageChef.Filesystems/FATX.cs
index e52f51249..57dfaeb48 100644
--- a/DiscImageChef.Filesystems/FATX.cs
+++ b/DiscImageChef.Filesystems/FATX.cs
@@ -62,8 +62,7 @@ namespace DiscImageChef.Filesystems
         {
             Name = "FATX Filesystem Plugin";
             PluginUUID = new Guid("ED27A721-4A17-4649-89FD-33633B46E228");
-            if(encoding == null)
-                CurrentEncoding = Encoding.UTF8;
+            CurrentEncoding = Encoding.UTF8;
         }
 
         public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
diff --git a/DiscImageChef.Filesystems/FFS.cs b/DiscImageChef.Filesystems/FFS.cs
index 75b22cae7..0edb85aa1 100644
--- a/DiscImageChef.Filesystems/FFS.cs
+++ b/DiscImageChef.Filesystems/FFS.cs
@@ -57,6 +57,8 @@ namespace DiscImageChef.Filesystems
             PluginUUID = new Guid("CC90D342-05DB-48A8-988C-C1FE000034A3");
             if(encoding == null)
                 CurrentEncoding = Encoding.GetEncoding("iso-8859-15");
+            else
+                CurrentEncoding = encoding;
         }
 
         public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
diff --git a/DiscImageChef.Filesystems/HAMMER.cs b/DiscImageChef.Filesystems/HAMMER.cs
index 6daa71e8f..001c1481e 100644
--- a/DiscImageChef.Filesystems/HAMMER.cs
+++ b/DiscImageChef.Filesystems/HAMMER.cs
@@ -61,6 +61,8 @@ namespace DiscImageChef.Filesystems
             PluginUUID = new Guid("91A188BF-5FD7-4677-BBD3-F59EBA9C864D");
             if(encoding == null)
                 CurrentEncoding = Encoding.GetEncoding("iso-8859-15");
+            else
+                CurrentEncoding = encoding;
         }
 
         public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
diff --git a/DiscImageChef.Filesystems/HPFS.cs b/DiscImageChef.Filesystems/HPFS.cs
index 4c263d3f7..3593fe078 100644
--- a/DiscImageChef.Filesystems/HPFS.cs
+++ b/DiscImageChef.Filesystems/HPFS.cs
@@ -55,6 +55,8 @@ namespace DiscImageChef.Filesystems
             PluginUUID = new Guid("33513B2C-f590-4acb-8bf2-0b1d5e19dec5");
             if(encoding == null)
                 CurrentEncoding = Encoding.GetEncoding("ibm850");
+            else
+                CurrentEncoding = encoding;
         }
 
         public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
diff --git a/DiscImageChef.Filesystems/JFS.cs b/DiscImageChef.Filesystems/JFS.cs
index e7f9ab4ab..56b641a0a 100644
--- a/DiscImageChef.Filesystems/JFS.cs
+++ b/DiscImageChef.Filesystems/JFS.cs
@@ -147,6 +147,8 @@ namespace DiscImageChef.Filesystems
             PluginUUID = new Guid("D3BE2A41-8F28-4055-94DC-BB6C72A0E9C4");
             if(encoding == null)
                 CurrentEncoding = Encoding.GetEncoding("iso-8859-15");
+            else
+                CurrentEncoding = encoding;
         }
 
         public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
diff --git a/DiscImageChef.Filesystems/MinixFS.cs b/DiscImageChef.Filesystems/MinixFS.cs
index 95cda6efe..c5876e135 100644
--- a/DiscImageChef.Filesystems/MinixFS.cs
+++ b/DiscImageChef.Filesystems/MinixFS.cs
@@ -76,6 +76,8 @@ namespace DiscImageChef.Filesystems
             PluginUUID = new Guid("FE248C3B-B727-4AE5-A39F-79EA9A07D4B3");
             if(encoding == null)
                 CurrentEncoding = Encoding.GetEncoding("iso-8859-15");
+            else
+                CurrentEncoding = encoding;
         }
 
         public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
diff --git a/DiscImageChef.Filesystems/NILFS2.cs b/DiscImageChef.Filesystems/NILFS2.cs
index 2e7f53534..825ba735d 100644
--- a/DiscImageChef.Filesystems/NILFS2.cs
+++ b/DiscImageChef.Filesystems/NILFS2.cs
@@ -110,6 +110,8 @@ namespace DiscImageChef.Filesystems
             PluginUUID = new Guid("35224226-C5CC-48B5-8FFD-3781E91E86B6");
             if(encoding == null)
                 CurrentEncoding = Encoding.UTF8;
+            else
+                CurrentEncoding = encoding;
         }
 
         public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
diff --git a/DiscImageChef.Filesystems/Nintendo.cs b/DiscImageChef.Filesystems/Nintendo.cs
index 0222300dc..a39947722 100644
--- a/DiscImageChef.Filesystems/Nintendo.cs
+++ b/DiscImageChef.Filesystems/Nintendo.cs
@@ -53,6 +53,8 @@ namespace DiscImageChef.Filesystems
             PluginUUID = new Guid("4675fcb4-4418-4288-9e4a-33d6a4ac1126");
             if(encoding == null)
                 CurrentEncoding = Encoding.GetEncoding("shift_jis");
+            else
+                CurrentEncoding = encoding;
         }
 
         public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
diff --git a/DiscImageChef.Filesystems/ODS.cs b/DiscImageChef.Filesystems/ODS.cs
index 661e718bc..84ac74051 100644
--- a/DiscImageChef.Filesystems/ODS.cs
+++ b/DiscImageChef.Filesystems/ODS.cs
@@ -62,6 +62,8 @@ namespace DiscImageChef.Filesystems
             PluginUUID = new Guid("de20633c-8021-4384-aeb0-83b0df14491f");
             if(encoding == null)
                 CurrentEncoding = Encoding.GetEncoding("iso-8859-1");
+            else
+                CurrentEncoding = encoding;
         }
 
         public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
diff --git a/DiscImageChef.Filesystems/Opera.cs b/DiscImageChef.Filesystems/Opera.cs
index 9c56ca5e7..ad1be5132 100644
--- a/DiscImageChef.Filesystems/Opera.cs
+++ b/DiscImageChef.Filesystems/Opera.cs
@@ -51,8 +51,8 @@ namespace DiscImageChef.Filesystems
         {
             Name = "Opera Filesystem Plugin";
             PluginUUID = new Guid("0ec84ec7-eae6-4196-83fe-943b3fe46dbd");
-            if(encoding == null) // TODO: Find correct default encoding
-                CurrentEncoding = Encoding.ASCII;
+            // TODO: Find correct default encoding
+            CurrentEncoding = Encoding.ASCII;
         }
 
         public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
diff --git a/DiscImageChef.Filesystems/PCEngine.cs b/DiscImageChef.Filesystems/PCEngine.cs
index 51dd9f164..7cab92a62 100644
--- a/DiscImageChef.Filesystems/PCEngine.cs
+++ b/DiscImageChef.Filesystems/PCEngine.cs
@@ -52,6 +52,8 @@ namespace DiscImageChef.Filesystems
             PluginUUID = new Guid("e5ee6d7c-90fa-49bd-ac89-14ef750b8af3");
             if(encoding == null)
                 CurrentEncoding = Encoding.GetEncoding("shift_jis");
+            else
+                CurrentEncoding = encoding;
         }
 
         public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
diff --git a/DiscImageChef.Filesystems/PFS.cs b/DiscImageChef.Filesystems/PFS.cs
index 34f6d1465..11821388d 100644
--- a/DiscImageChef.Filesystems/PFS.cs
+++ b/DiscImageChef.Filesystems/PFS.cs
@@ -53,6 +53,8 @@ namespace DiscImageChef.Filesystems
             PluginUUID = new Guid("68DE769E-D957-406A-8AE4-3781CA8CDA77");
             if(encoding == null)
                 CurrentEncoding = Encoding.GetEncoding("iso-8859-1");
+            else
+                CurrentEncoding = encoding;
         }
 
         /// <summary>
diff --git a/DiscImageChef.Filesystems/ProDOS.cs b/DiscImageChef.Filesystems/ProDOS.cs
index 42a088813..283a6f17d 100644
--- a/DiscImageChef.Filesystems/ProDOS.cs
+++ b/DiscImageChef.Filesystems/ProDOS.cs
@@ -90,8 +90,8 @@ namespace DiscImageChef.Filesystems
         {
             Name = "Apple ProDOS filesystem";
             PluginUUID = new Guid("43874265-7B8A-4739-BCF7-07F80D5932BF");
-            if(encoding == null) // TODO: Until Apple ][ encoding is implemented
-                CurrentEncoding = new Claunia.Encoding.LisaRoman();
+            // TODO: Until Apple ][ encoding is implemented
+            CurrentEncoding = new Claunia.Encoding.LisaRoman();
         }
 
         public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
diff --git a/DiscImageChef.Filesystems/QNX4.cs b/DiscImageChef.Filesystems/QNX4.cs
index 9345b98ce..3dbfe6cc0 100644
--- a/DiscImageChef.Filesystems/QNX4.cs
+++ b/DiscImageChef.Filesystems/QNX4.cs
@@ -121,6 +121,8 @@ namespace DiscImageChef.Filesystems
             PluginUUID = new Guid("E73A63FA-B5B0-48BF-BF82-DA5F0A8170D2");
             if(encoding == null)
                 CurrentEncoding = Encoding.GetEncoding("iso-8859-15");
+            else
+                CurrentEncoding = encoding;
         }
 
         public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
diff --git a/DiscImageChef.Filesystems/QNX6.cs b/DiscImageChef.Filesystems/QNX6.cs
index 0053e007e..deaafd1dc 100644
--- a/DiscImageChef.Filesystems/QNX6.cs
+++ b/DiscImageChef.Filesystems/QNX6.cs
@@ -116,6 +116,8 @@ namespace DiscImageChef.Filesystems
             PluginUUID = new Guid("3E610EA2-4D08-4D70-8947-830CD4C74FC0");
             if(encoding == null)
                 CurrentEncoding = Encoding.GetEncoding("iso-8859-15");
+            else
+                CurrentEncoding = encoding;
         }
 
         public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
diff --git a/DiscImageChef.Filesystems/Reiser.cs b/DiscImageChef.Filesystems/Reiser.cs
index dbff5738a..c741d0eda 100644
--- a/DiscImageChef.Filesystems/Reiser.cs
+++ b/DiscImageChef.Filesystems/Reiser.cs
@@ -104,6 +104,8 @@ namespace DiscImageChef.Filesystems
             PluginUUID = new Guid("1D8CD8B8-27E6-410F-9973-D16409225FBA");
             if(encoding == null)
                 CurrentEncoding = Encoding.GetEncoding("iso-8859-15");
+            else
+                CurrentEncoding = encoding;
         }
 
         public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
diff --git a/DiscImageChef.Filesystems/Reiser4.cs b/DiscImageChef.Filesystems/Reiser4.cs
index d0e4804ce..3ab243d04 100644
--- a/DiscImageChef.Filesystems/Reiser4.cs
+++ b/DiscImageChef.Filesystems/Reiser4.cs
@@ -69,6 +69,8 @@ namespace DiscImageChef.Filesystems
             PluginUUID = new Guid("301F2D00-E8D5-4F04-934E-81DFB21D15BA");
             if(encoding == null)
                 CurrentEncoding = Encoding.GetEncoding("iso-8859-15");
+            else
+                CurrentEncoding = encoding;
         }
 
         public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
diff --git a/DiscImageChef.Filesystems/SFS.cs b/DiscImageChef.Filesystems/SFS.cs
index 3211098e1..e48c76911 100644
--- a/DiscImageChef.Filesystems/SFS.cs
+++ b/DiscImageChef.Filesystems/SFS.cs
@@ -53,6 +53,8 @@ namespace DiscImageChef.Filesystems
             PluginUUID = new Guid("26550C19-3671-4A2D-BC2F-F20CEB7F48DC");
             if(encoding == null)
                 CurrentEncoding = Encoding.GetEncoding("iso-8859-1");
+            else
+                CurrentEncoding = encoding;
         }
 
         [Flags]
diff --git a/DiscImageChef.Filesystems/SolarFS.cs b/DiscImageChef.Filesystems/SolarFS.cs
index 8157b987c..f8e92a2a6 100644
--- a/DiscImageChef.Filesystems/SolarFS.cs
+++ b/DiscImageChef.Filesystems/SolarFS.cs
@@ -54,6 +54,8 @@ namespace DiscImageChef.Filesystems
             PluginUUID = new Guid("EA3101C1-E777-4B4F-B5A3-8C57F50F6E65");
             if(encoding == null)
                 CurrentEncoding = Encoding.GetEncoding("iso-8859-15");
+            else
+                CurrentEncoding = encoding;
         }
 
         public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
diff --git a/DiscImageChef.Filesystems/Squash.cs b/DiscImageChef.Filesystems/Squash.cs
index a1f9b785b..ed2d6b80f 100644
--- a/DiscImageChef.Filesystems/Squash.cs
+++ b/DiscImageChef.Filesystems/Squash.cs
@@ -53,6 +53,8 @@ namespace DiscImageChef.Filesystems
             PluginUUID = new Guid("F8F6E46F-7A2A-48E3-9C0A-46AF4DC29E09");
             if(encoding == null)
                 CurrentEncoding = Encoding.UTF8;
+            else
+                CurrentEncoding = encoding;
         }
 
         enum SquashCompression : ushort
diff --git a/DiscImageChef.Filesystems/SysV.cs b/DiscImageChef.Filesystems/SysV.cs
index 3360933e6..ebcbf8cd5 100644
--- a/DiscImageChef.Filesystems/SysV.cs
+++ b/DiscImageChef.Filesystems/SysV.cs
@@ -68,6 +68,8 @@ namespace DiscImageChef.Filesystems
             PluginUUID = new Guid("9B8D016A-8561-400E-A12A-A198283C211D");
             if(encoding == null)
                 CurrentEncoding = Encoding.GetEncoding("iso-8859-15");
+            else
+                CurrentEncoding = encoding;
         }
 
         public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
diff --git a/DiscImageChef.Filesystems/UCSDPascal/UCSDPascal.cs b/DiscImageChef.Filesystems/UCSDPascal/UCSDPascal.cs
index 3b67fbeae..526c7e0df 100644
--- a/DiscImageChef.Filesystems/UCSDPascal/UCSDPascal.cs
+++ b/DiscImageChef.Filesystems/UCSDPascal/UCSDPascal.cs
@@ -62,8 +62,8 @@ namespace DiscImageChef.Filesystems.UCSDPascal
             device = imagePlugin;
             Name = "U.C.S.D. Pascal filesystem";
             PluginUUID = new Guid("B0AC2CB5-72AA-473A-9200-270B5A2C2D53");
-            if(encoding == null) // TODO: Until Apple ][ encoding is implemented
-                CurrentEncoding = new Claunia.Encoding.LisaRoman();
+            // TODO: Until Apple ][ encoding is implemented
+            CurrentEncoding = new Claunia.Encoding.LisaRoman();
         }
 
         public override Errno ListXAttr(string path, ref List<string> xattrs)
diff --git a/DiscImageChef.Filesystems/UNIXBFS.cs b/DiscImageChef.Filesystems/UNIXBFS.cs
index 87435744a..d02bda46c 100644
--- a/DiscImageChef.Filesystems/UNIXBFS.cs
+++ b/DiscImageChef.Filesystems/UNIXBFS.cs
@@ -56,6 +56,8 @@ namespace DiscImageChef.Filesystems
             PluginUUID = new Guid("1E6E0DA6-F7E4-494C-80C6-CB5929E96155");
             if(encoding == null)
                 CurrentEncoding = Encoding.GetEncoding("iso-8859-15");
+            else
+                CurrentEncoding = encoding;
         }
 
         public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
diff --git a/DiscImageChef.Filesystems/VMfs.cs b/DiscImageChef.Filesystems/VMfs.cs
index 1d66de540..0c59f6b26 100644
--- a/DiscImageChef.Filesystems/VMfs.cs
+++ b/DiscImageChef.Filesystems/VMfs.cs
@@ -53,6 +53,8 @@ namespace DiscImageChef.Filesystems
             PluginUUID = new Guid("EE52BDB8-B49C-4122-A3DA-AD21CBE79843");
             if(encoding == null)
                 CurrentEncoding = Encoding.UTF8;
+            else
+                CurrentEncoding = encoding;
         }
 
         [Flags]
diff --git a/DiscImageChef.Filesystems/VxFS.cs b/DiscImageChef.Filesystems/VxFS.cs
index c6fa757d1..475555a91 100644
--- a/DiscImageChef.Filesystems/VxFS.cs
+++ b/DiscImageChef.Filesystems/VxFS.cs
@@ -53,6 +53,8 @@ namespace DiscImageChef.Filesystems
             PluginUUID = new Guid("EC372605-7687-453C-8BEA-7E0DFF79CB03");
             if(encoding == null)
                 CurrentEncoding = Encoding.UTF8;
+            else
+                CurrentEncoding = encoding;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
diff --git a/DiscImageChef.Filesystems/XFS.cs b/DiscImageChef.Filesystems/XFS.cs
index 612459306..4bba69964 100644
--- a/DiscImageChef.Filesystems/XFS.cs
+++ b/DiscImageChef.Filesystems/XFS.cs
@@ -117,6 +117,8 @@ namespace DiscImageChef.Filesystems
             PluginUUID = new Guid("1D8CD8B8-27E6-410F-9973-D16409225FBA");
             if(encoding == null)
                 CurrentEncoding = Encoding.GetEncoding("iso-8859-15");
+            else
+                CurrentEncoding = encoding;
         }
 
         public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
diff --git a/DiscImageChef.Filesystems/exFAT.cs b/DiscImageChef.Filesystems/exFAT.cs
index 99d7431d0..57642572e 100644
--- a/DiscImageChef.Filesystems/exFAT.cs
+++ b/DiscImageChef.Filesystems/exFAT.cs
@@ -56,6 +56,8 @@ namespace DiscImageChef.Filesystems
             PluginUUID = new Guid("8271D088-1533-4CB3-AC28-D802B68BB95C");
             if(encoding == null)
                 CurrentEncoding = Encoding.GetEncoding("iso-8859-15");
+            else
+                CurrentEncoding = encoding;
         }
 
         public override bool Identify(ImagePlugin imagePlugin, Partition partition)
diff --git a/DiscImageChef.Filesystems/ext2FS.cs b/DiscImageChef.Filesystems/ext2FS.cs
index 89c8c95d4..5a372d34e 100644
--- a/DiscImageChef.Filesystems/ext2FS.cs
+++ b/DiscImageChef.Filesystems/ext2FS.cs
@@ -54,6 +54,8 @@ namespace DiscImageChef.Filesystems
             PluginUUID = new Guid("6AA91B88-150B-4A7B-AD56-F84FB2DF4184");
             if(encoding == null)
                 CurrentEncoding = Encoding.GetEncoding("iso-8859-15");
+            else
+                CurrentEncoding = encoding;
         }
 
         public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
diff --git a/DiscImageChef.Filesystems/extFS.cs b/DiscImageChef.Filesystems/extFS.cs
index 8a9f76dfa..a81ec11bb 100644
--- a/DiscImageChef.Filesystems/extFS.cs
+++ b/DiscImageChef.Filesystems/extFS.cs
@@ -53,6 +53,8 @@ namespace DiscImageChef.Filesystems
             PluginUUID = new Guid("076CB3A2-08C2-4D69-BC8A-FCAA2E502BE2");
             if(encoding == null)
                 CurrentEncoding = Encoding.GetEncoding("iso-8859-15");
+            else
+                CurrentEncoding = encoding;
         }
 
         public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)