diff --git a/getid3/getid3.php b/getid3/getid3.php
index 7b3d7692..3fdb00d0 100644
--- a/getid3/getid3.php
+++ b/getid3/getid3.php
@@ -387,7 +387,7 @@ class getID3
 	 */
 	protected $startup_warning = '';
 
-	const VERSION           = '1.9.22-202304051421';
+	const VERSION           = '1.9.22-202304051539';
 	const FREAD_BUFFER_SIZE = 32768;
 
 	const ATTACHMENTS_NONE   = false;
diff --git a/getid3/module.audio-video.quicktime.php b/getid3/module.audio-video.quicktime.php
index 26cafabc..e998581b 100644
--- a/getid3/module.audio-video.quicktime.php
+++ b/getid3/module.audio-video.quicktime.php
@@ -2115,7 +2115,7 @@ public function QuicktimeParseAtom($atomname, $atomsize, $atom_data, $baseoffset
 					$atom_structure['ES_DescrTag'] = getid3_lib::BigEndian2Int(substr($atom_data, $esds_offset, 1));
 					$esds_offset += 1;
 					if ($atom_structure['ES_DescrTag'] != 0x03) {
-						$this->warning('expecting esds.ES_DescrTag = 0x03, found 0x'.getid3_lib::PrintHexBytes($atom_structure['ES_DescrTag']).'), at offset '.$subatomdata['offset']);
+						$this->warning('expecting esds.ES_DescrTag = 0x03, found 0x'.getid3_lib::PrintHexBytes($atom_structure['ES_DescrTag']).'), at offset '.$atom_structure['offset']);
 						break;
 					}
 					$atom_structure['ES_DescrSize'] = $this->quicktime_readESsize(substr($atom_data, $esds_offset, 4), $bytesread);
@@ -2129,7 +2129,7 @@ public function QuicktimeParseAtom($atomname, $atomsize, $atom_data, $baseoffset
 					$atom_structure['ES_flags']['ocr_stream']        = (bool) ($atom_structure['ES_flagsraw'] & 0x20);
 					$atom_structure['ES_stream_priority']            =        ($atom_structure['ES_flagsraw'] & 0x1F);
 					if ($atom_structure['ES_flags']['url_flag']) {
-						$this->warning('Unsupported esds.url_flag enabled at offset '.$subatomdata['offset']);
+						$this->warning('Unsupported esds.url_flag enabled at offset '.$atom_structure['offset']);
 						break;
 					}
 					if ($atom_structure['ES_flags']['stream_dependency']) {
@@ -2144,7 +2144,7 @@ public function QuicktimeParseAtom($atomname, $atomsize, $atom_data, $baseoffset
 					$atom_structure['ES_DecoderConfigDescrTag'] = getid3_lib::BigEndian2Int(substr($atom_data, $esds_offset, 1));
 					$esds_offset += 1;
 					if ($atom_structure['ES_DecoderConfigDescrTag'] != 0x04) {
-						$this->warning('expecting esds.ES_DecoderConfigDescrTag = 0x04, found 0x'.getid3_lib::PrintHexBytes($atom_structure['ES_DecoderConfigDescrTag']).'), at offset '.$subatomdata['offset']);
+						$this->warning('expecting esds.ES_DecoderConfigDescrTag = 0x04, found 0x'.getid3_lib::PrintHexBytes($atom_structure['ES_DecoderConfigDescrTag']).'), at offset '.$atom_structure['offset']);
 						break;
 					}
 					$atom_structure['ES_DecoderConfigDescrTagSize'] = $this->quicktime_readESsize(substr($atom_data, $esds_offset, 4), $bytesread);
@@ -2176,7 +2176,7 @@ public function QuicktimeParseAtom($atomname, $atomsize, $atom_data, $baseoffset
 					$atom_structure['ES_DecSpecificInfoTag'] = getid3_lib::BigEndian2Int(substr($atom_data, $esds_offset, 1));
 					$esds_offset += 1;
 					if ($atom_structure['ES_DecSpecificInfoTag'] != 0x05) {
-						$this->warning('expecting esds.ES_DecSpecificInfoTag = 0x05, found 0x'.getid3_lib::PrintHexBytes($atom_structure['ES_DecSpecificInfoTag']).'), at offset '.$subatomdata['offset']);
+						$this->warning('expecting esds.ES_DecSpecificInfoTag = 0x05, found 0x'.getid3_lib::PrintHexBytes($atom_structure['ES_DecSpecificInfoTag']).'), at offset '.$atom_structure['offset']);
 						break;
 					}
 					$atom_structure['ES_DecSpecificInfoTagSize'] = $this->quicktime_readESsize(substr($atom_data, $esds_offset, 4), $bytesread);
@@ -2187,7 +2187,7 @@ public function QuicktimeParseAtom($atomname, $atomsize, $atom_data, $baseoffset
 					$atom_structure['ES_SLConfigDescrTag'] = getid3_lib::BigEndian2Int(substr($atom_data, $esds_offset, 1));
 					$esds_offset += 1;
 					if ($atom_structure['ES_SLConfigDescrTag'] != 0x06) {
-						$this->warning('expecting esds.ES_SLConfigDescrTag = 0x05, found 0x'.getid3_lib::PrintHexBytes($atom_structure['ES_SLConfigDescrTag']).'), at offset '.$subatomdata['offset']);
+						$this->warning('expecting esds.ES_SLConfigDescrTag = 0x05, found 0x'.getid3_lib::PrintHexBytes($atom_structure['ES_SLConfigDescrTag']).'), at offset '.$atom_structure['offset']);
 						break;
 					}
 					$atom_structure['ES_SLConfigDescrTagSize'] = $this->quicktime_readESsize(substr($atom_data, $esds_offset, 4), $bytesread);