diff --git a/Mirivoice/Mirivoice.Plugins.Builtin/Phonemizers/BasePhonemizer.cs b/Mirivoice/Mirivoice.Plugins.Builtin/Phonemizers/BasePhonemizer.cs
index 19f9573..cccda8d 100644
--- a/Mirivoice/Mirivoice.Plugins.Builtin/Phonemizers/BasePhonemizer.cs
+++ b/Mirivoice/Mirivoice.Plugins.Builtin/Phonemizers/BasePhonemizer.cs
@@ -327,17 +327,12 @@ public static MResultPrototype[] SetUpProsody(LineBoxView l, List<MResultPrototy
                         }
                     }
 
-                    if (next is not null && IsPunctuation(next.Phoneme) && endPuncs.Contains(next.Phoneme))
+                    if (i == results.Count - 1 ||  IsPunctuation(results[i].Phoneme) && results[i].Phoneme.Trim() != string.Empty)
                     {
                         //Log.Debug($"Next is punctuation: {next.Phoneme}");
                         //Log.Debug($"Current: {mResultPrototype.Phoneme}");
                         mResultPrototype.ProsodyType = (int)ProsodyType.Eos;
                     }
-                    if (i == results.Count - 1 && prev is not null && prev.ProsodyType != (int)ProsodyType.Eos)
-                    {
-
-                        mResultPrototype.ProsodyType = (int)ProsodyType.Eos;
-                    }
 
 
                     if (mResultPrototype.ProsodyType == (int)ProsodyType.Undefined) // if not set