diff --git a/.idea/.idea.DiscImageChef/.idea/contentModel.xml b/.idea/.idea.DiscImageChef/.idea/contentModel.xml
index 69ae7570f..a7c879371 100644
--- a/.idea/.idea.DiscImageChef/.idea/contentModel.xml
+++ b/.idea/.idea.DiscImageChef/.idea/contentModel.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ContentModelStore">
-    <e p="$APPLICATION_CONFIG_DIR$/consoles/db" t="IncludeRecursive" />
     <e p="$APPLICATION_CONFIG_DIR$/extensions" t="IncludeRecursive" />
-    <e p="$USER_HOME$/.Rider2018.2/system/extResources" t="IncludeRecursive" />
-    <e p="$USER_HOME$/.Rider2018.2/system/resharper-host/local/Transient/ReSharperHost/v182/SolutionCaches/_DiscImageChef.73225794.00" t="ExcludeRecursive" />
+    <e p="$USER_HOME$/.Rider2018.3/system/extResources" t="IncludeRecursive" />
+    <e p="$USER_HOME$/.Rider2018.3/system/resharper-host/local/Transient/ReSharperHost/v183/SolutionCaches/_DiscImageChef.73225794.00" t="ExcludeRecursive" />
     <e p="$USER_HOME$/.nuget/packages/sqlitepclraw.lib.e_sqlite3.linux/1.1.11/runtimes/linux-x64/native/libe_sqlite3.so" t="Include" />
     <e p="$PROJECT_DIR$" t="IncludeFlat">
       <e p=".git/info/exclude" t="IncludeRecursive" />
@@ -492,6 +491,7 @@
             <e p="MCPT.cs" t="Include" />
             <e p="Smart.cs" t="Include" />
           </e>
+          <e p="AtaCommands.cs" t="Include" />
           <e p="Commands.cs" t="Include" />
           <e p="Constructor.cs" t="Include" />
           <e p="Destructor.cs" t="Include" />
diff --git a/DiscImageChef.Core/Media/Info/ScsiInfo.cs b/DiscImageChef.Core/Media/Info/ScsiInfo.cs
index 51adace36..0371421b7 100644
--- a/DiscImageChef.Core/Media/Info/ScsiInfo.cs
+++ b/DiscImageChef.Core/Media/Info/ScsiInfo.cs
@@ -1244,14 +1244,15 @@ namespace DiscImageChef.Core.Media.Info
 
             if(DeviceInfo.ScsiType != PeripheralDeviceTypes.MultiMediaDevice) return;
 
-            byte[] sector0                 = null;
-            byte[] sector1                 = null;
-            byte[] ps2BootSectors          = null;
-            byte[] playdia1                = null;
-            byte[] playdia2                = null;
-            byte[] firstDataSectorNotZero  = null;
-            byte[] secondDataSectorNotZero = null;
-            byte[] firstTrackSecondSession = null;
+            byte[] sector0                      = null;
+            byte[] sector1                      = null;
+            byte[] ps2BootSectors               = null;
+            byte[] playdia1                     = null;
+            byte[] playdia2                     = null;
+            byte[] firstDataSectorNotZero       = null;
+            byte[] secondDataSectorNotZero      = null;
+            byte[] firstTrackSecondSession      = null;
+            byte[] firstTrackSecondSessionAudio = null;
 
             if(secondSessionFirstTrack != 0 && DecodedToc.HasValue &&
                DecodedToc.Value.TrackDescriptors.Any(t => t.TrackNumber == secondSessionFirstTrack))
@@ -1274,6 +1275,20 @@ namespace DiscImageChef.Core.Media.Info
 
                     if(!sense && !dev.Error) firstTrackSecondSession = cmdBuf;
                 }
+
+                sense = dev.ReadCd(out cmdBuf, out senseBuf, firstSectorSecondSessionFirstTrack - 1, 2352, 3,
+                                   MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders, true, true,
+                                   MmcErrorField.None, MmcSubchannel.None, dev.Timeout, out _);
+
+                if(!sense && !dev.Error) firstTrackSecondSessionAudio = cmdBuf;
+                else
+                {
+                    sense = dev.ReadCd(out cmdBuf, out senseBuf, firstSectorSecondSessionFirstTrack - 1, 2352, 3,
+                                       MmcSectorTypes.Cdda, false, false, true, MmcHeaderCodes.None, true, true,
+                                       MmcErrorField.None, MmcSubchannel.None, dev.Timeout, out _);
+
+                    if(!sense && !dev.Error) firstTrackSecondSessionAudio = cmdBuf;
+                }
             }
 
             // Check for hidden data before start of track 1
@@ -1691,26 +1706,27 @@ namespace DiscImageChef.Core.Media.Info
                         if(PcFxSignature.SequenceEqual(pcfx)) MediaType = MediaType.PCFX;
                     }
 
-                    if(firstTrackSecondSession != null)
+                    if(firstTrackSecondSessionAudio != null)
                     {
                         byte[] jaguar = new byte[AtariSignature.Length];
-                        for(int i = 0; i + jaguar.Length <= firstTrackSecondSession.Length; i += 2)
+                        for(int i = 0; i + jaguar.Length <= firstTrackSecondSessionAudio.Length; i += 2)
                         {
-                            Array.Copy(firstTrackSecondSession, i, jaguar, 0, jaguar.Length);
+                            Array.Copy(firstTrackSecondSessionAudio, i, jaguar, 0, jaguar.Length);
 
                             if(!AtariSignature.SequenceEqual(jaguar)) continue;
 
                             MediaType = MediaType.JaguarCD;
                             break;
                         }
+                    }
 
+                    if(firstTrackSecondSession != null)
                         if(firstTrackSecondSession.Length >= 2336)
                         {
                             byte[] milcd = new byte[2048];
                             Array.Copy(firstTrackSecondSession, 24, milcd, 0, 2048);
                             if(Dreamcast.DecodeIPBin(milcd).HasValue) MediaType = MediaType.MilCD;
                         }
-                    }
 
                     break;
                 }