diff --git a/composeApp/src/androidMain/kotlin/mg/dot/feufaro/midi/MidiPlayer.kt b/composeApp/src/androidMain/kotlin/mg/dot/feufaro/midi/MidiPlayer.kt
index b50b9ab..db4c25a 100644
--- a/composeApp/src/androidMain/kotlin/mg/dot/feufaro/midi/MidiPlayer.kt
+++ b/composeApp/src/androidMain/kotlin/mg/dot/feufaro/midi/MidiPlayer.kt
@@ -429,10 +429,12 @@ actual class FMediaPlayer actual constructor(
                 val nextMarker = markerList.getOrNull(i + 1)
                 val nextTrim = nextMarker?.trim() ?: ""
 
-                val isDsFin = (dsR.containsMatchIn(mTrim) && finReg.containsMatchIn(nextTrim)) ||
-                        (dsR.containsMatchIn(nextTrim) && finReg.containsMatchIn(mTrim))
-                val isDcFin = (dcR.containsMatchIn(mTrim) && finReg.containsMatchIn(nextTrim)) ||
-                        (dcR.containsMatchIn(nextTrim) && finReg.containsMatchIn(mTrim))
+                val hasDs = dsR.containsMatchIn(mTrim)
+                val hasDc = dcR.containsMatchIn(mTrim)
+                val hasFin = finReg.containsMatchIn(mTrim) || finReg.containsMatchIn(nextTrim)
+
+                val isDsFin = hasDs && hasFin
+                val isDcFin = hasDc && hasFin
                 when {
                     isDsFin || isDcFin -> {
                         val target = if (lastSegno > 0) lastSegno else 0
diff --git a/composeApp/src/desktopMain/kotlin/mg/dot/feufaro/midi/MidiPlayer.kt b/composeApp/src/desktopMain/kotlin/mg/dot/feufaro/midi/MidiPlayer.kt
index 2a72a88..e5013f1 100644
--- a/composeApp/src/desktopMain/kotlin/mg/dot/feufaro/midi/MidiPlayer.kt
+++ b/composeApp/src/desktopMain/kotlin/mg/dot/feufaro/midi/MidiPlayer.kt
@@ -275,11 +275,9 @@ actual class FMediaPlayer actual constructor(
 
                 val hasDs = dsRegex.containsMatchIn(mTrim)
                 val hasDc = dcRegex.containsMatchIn(mTrim)
-                val hasFin = finReg.containsMatchIn(mTrim)
-
-                val isDsFin = (dsRegex.containsMatchIn(mTrim) && finReg.containsMatchIn(nextTrim))
-                val isDcFin = (dcRegex.containsMatchIn(mTrim) && finReg.containsMatchIn(nextTrim))
-
+                val hasFin = finReg.containsMatchIn(mTrim) || finReg.containsMatchIn(nextTrim)
+                val isDcFin = hasDc && hasFin
+                val isDsFin = hasDs && hasFin
                 when {
                     //DSFin
                     isDsFin || isDcFin -> {