diff --git a/DiscImageChef.Filesystems/LisaFS/Dir.cs b/DiscImageChef.Filesystems/LisaFS/Dir.cs
index 78884f8f..18abcd2c 100644
--- a/DiscImageChef.Filesystems/LisaFS/Dir.cs
+++ b/DiscImageChef.Filesystems/LisaFS/Dir.cs
@@ -97,7 +97,7 @@ namespace DiscImageChef.Filesystems.LisaFS
                 if(entry.parentID == dirId)
                     // Do same trick as Mac OS X, replace filesystem '/' with '-',
                     // as '-' is the path separator in Lisa OS
-                    contents.Add(CurrentEncoding.GetString(entry.filename).Replace('/', '-'));
+                    contents.Add(StringHandlers.CToString(entry.filename, CurrentEncoding).Replace('/', '-'));
             }
 
             return Errno.NoError;
diff --git a/DiscImageChef.Filesystems/LisaFS/Extent.cs b/DiscImageChef.Filesystems/LisaFS/Extent.cs
index 8c833c31..9e8ac4fa 100644
--- a/DiscImageChef.Filesystems/LisaFS/Extent.cs
+++ b/DiscImageChef.Filesystems/LisaFS/Extent.cs
@@ -196,7 +196,7 @@ namespace DiscImageChef.Filesystems.LisaFS
                     if(!printedExtents.Contains(fileId))
                     {
                         DicConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].filenameLen = {1}", fileId, file.filenameLen);
-                        DicConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].filename = {1}", fileId, CurrentEncoding.GetString(file.filename));
+                        DicConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].filename = {1}", fileId, StringHandlers.CToString(file.filename, CurrentEncoding));
                         DicConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].unknown1 = 0x{1:X4}", fileId, file.unknown1);
                         DicConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].file_uid = 0x{1:X16}", fileId, file.file_uid);
                         DicConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].unknown2 = 0x{1:X2}", fileId, file.unknown2);
diff --git a/DiscImageChef.Filesystems/LisaFS/File.cs b/DiscImageChef.Filesystems/LisaFS/File.cs
index 86c3e645..871ec47b 100644
--- a/DiscImageChef.Filesystems/LisaFS/File.cs
+++ b/DiscImageChef.Filesystems/LisaFS/File.cs
@@ -504,7 +504,7 @@ namespace DiscImageChef.Filesystems.LisaFS
 
                 foreach(CatalogEntry entry in catalogCache)
                 {
-                    string filename = CurrentEncoding.GetString(entry.filename);
+                    string filename = StringHandlers.CToString(entry.filename, CurrentEncoding);
 
                     // LisaOS is case insensitive
                     if(string.Compare(wantedFilename, filename, StringComparison.InvariantCultureIgnoreCase) == 0