diff --git a/DiscImageChef.Filesystems/ISO9660/Structs/CDi.cs b/DiscImageChef.Filesystems/ISO9660/Structs/CDi.cs
index ce00d3c1..9275dce8 100644
--- a/DiscImageChef.Filesystems/ISO9660/Structs/CDi.cs
+++ b/DiscImageChef.Filesystems/ISO9660/Structs/CDi.cs
@@ -42,12 +42,12 @@ namespace DiscImageChef.Filesystems.ISO9660
         {
             DecodedVolumeDescriptor decodedVD = new DecodedVolumeDescriptor
             {
-                SystemIdentifier = Encoding.ASCII.GetString(pvd.system_id).TrimEnd().Trim('\0'),
-                VolumeIdentifier = Encoding.ASCII.GetString(pvd.volume_id).TrimEnd().Trim('\0'),
-                VolumeSetIdentifier = Encoding.ASCII.GetString(pvd.volume_set_id).TrimEnd().Trim('\0'),
-                PublisherIdentifier = Encoding.ASCII.GetString(pvd.publisher_id).TrimEnd().Trim('\0'),
-                DataPreparerIdentifier = Encoding.ASCII.GetString(pvd.preparer_id).TrimEnd().Trim('\0'),
-                ApplicationIdentifier = Encoding.ASCII.GetString(pvd.application_data).TrimEnd().Trim('\0')
+                SystemIdentifier = StringHandlers.CToString(pvd.system_id).TrimEnd(),
+                VolumeIdentifier = StringHandlers.CToString(pvd.volume_id).TrimEnd(),
+                VolumeSetIdentifier = StringHandlers.CToString(pvd.volume_set_id).TrimEnd(),
+                PublisherIdentifier = StringHandlers.CToString(pvd.publisher_id).TrimEnd(),
+                DataPreparerIdentifier = StringHandlers.CToString(pvd.preparer_id).TrimEnd(),
+                ApplicationIdentifier = StringHandlers.CToString(pvd.application_data).TrimEnd()
             };
 
             if(pvd.creation_date[0] == '0' || pvd.creation_date[0] == 0x00) decodedVD.CreationTime = DateTime.MinValue;
diff --git a/DiscImageChef.Filesystems/ISO9660/Structs/ISO.cs b/DiscImageChef.Filesystems/ISO9660/Structs/ISO.cs
index 37866aa7..8cee591b 100644
--- a/DiscImageChef.Filesystems/ISO9660/Structs/ISO.cs
+++ b/DiscImageChef.Filesystems/ISO9660/Structs/ISO.cs
@@ -42,12 +42,12 @@ namespace DiscImageChef.Filesystems.ISO9660
         {
             DecodedVolumeDescriptor decodedVD = new DecodedVolumeDescriptor
             {
-                SystemIdentifier = Encoding.ASCII.GetString(pvd.system_id).TrimEnd().Trim('\0'),
-                VolumeIdentifier = Encoding.ASCII.GetString(pvd.volume_id).TrimEnd().Trim('\0'),
-                VolumeSetIdentifier = Encoding.ASCII.GetString(pvd.volume_set_id).TrimEnd().Trim('\0'),
-                PublisherIdentifier = Encoding.ASCII.GetString(pvd.publisher_id).TrimEnd().Trim('\0'),
-                DataPreparerIdentifier = Encoding.ASCII.GetString(pvd.preparer_id).TrimEnd().Trim('\0'),
-                ApplicationIdentifier = Encoding.ASCII.GetString(pvd.application_data).TrimEnd().Trim('\0')
+                SystemIdentifier = StringHandlers.CToString(pvd.system_id).TrimEnd(),
+                VolumeIdentifier = StringHandlers.CToString(pvd.volume_id).TrimEnd(),
+                VolumeSetIdentifier = StringHandlers.CToString(pvd.volume_set_id).TrimEnd(),
+                PublisherIdentifier = StringHandlers.CToString(pvd.publisher_id).TrimEnd(),
+                DataPreparerIdentifier = StringHandlers.CToString(pvd.preparer_id).TrimEnd(),
+                ApplicationIdentifier = StringHandlers.CToString(pvd.application_data).TrimEnd()
             };
 
             if(pvd.creation_date[0] == '0' || pvd.creation_date[0] == 0x00) decodedVD.CreationTime = DateTime.MinValue;