diff --git a/src/Tools/psxcdgen_ex/src/encoder/builder.rs b/src/Tools/psxcdgen_ex/src/encoder/builder.rs
index c6a3c33d..fa088c01 100644
--- a/src/Tools/psxcdgen_ex/src/encoder/builder.rs
+++ b/src/Tools/psxcdgen_ex/src/encoder/builder.rs
@@ -26,10 +26,12 @@ impl SubModeBuilder {
 }
 
 pub fn create_audio_for_vec(audio_samples: &Vec<AudioSample>) -> Vec<Audio> {
-    let     samples_to_parse = sector_count_audio(audio_samples.len());
+    let     samples_to_parse = sector_count_audio(audio_samples.len()*std::mem::size_of::<AudioSample>());
     let mut samples          = &audio_samples[0..audio_samples.len()];
     let mut parsed_samples   = Vec::new();
 
+    // TODO: When asking to the LOC of a track, the PS1 does not consider the sector count and just returns (min:seconds);
+    // psxcdgen_ex has to make sure that songs start at sector 0
     for _ in 0..samples_to_parse {
         let mut audio = Audio::new();