diff --git a/src/libespeak-ng/phoneme.c b/src/libespeak-ng/phoneme.c
index a0fa181b..af2cea2c 100644
--- a/src/libespeak-ng/phoneme.c
+++ b/src/libespeak-ng/phoneme.c
@@ -171,8 +171,8 @@ phoneme_add_feature(PHONEME_TAB *phoneme,
 	case vcd:
 		phoneme->phflags |= phVOICED;
 		break;
-	case vls: // FIXME: This should be a phVOICELESS (!phVOICED) flag. Fortis/lenis are a different thing.
-		phoneme->phflags |= phFORTIS;
+	case vls:
+		phoneme->phflags != phVOICELESS;
 		break;
 	// invalid phoneme feature
 	default:
diff --git a/src/libespeak-ng/phoneme.h b/src/libespeak-ng/phoneme.h
index 7ae486a2..5b7c7c6d 100644
--- a/src/libespeak-ng/phoneme.h
+++ b/src/libespeak-ng/phoneme.h
@@ -41,7 +41,7 @@ extern "C"
 #define phARTICULATION 0xf0000
 #define phWAVE     0x01
 #define phUNSTRESSED 0x02
-#define phFORTIS   0x08
+#define phVOICELESS  0x08
 #define phVOICED   0x10
 #define phSIBILANT 0x20
 #define phNOLINK   0x40
diff --git a/src/libespeak-ng/setlengths.c b/src/libespeak-ng/setlengths.c
index 61cc0f5c..9aa6c4ae 100644
--- a/src/libespeak-ng/setlengths.c
+++ b/src/libespeak-ng/setlengths.c
@@ -519,7 +519,7 @@ void CalcLengths(Translator *tr)
 					p->prepause = 15;
 			}
 
-			if (next->type == phPAUSE && prev->type == phNASAL && !(p->ph->phflags&phFORTIS))
+			if (next->type == phPAUSE && prev->type == phNASAL && !(p->ph->phflags&phVOICELESS))
 				p->prepause = 25;
 
 			if (prev->ph->phflags & phBRKAFTER)
@@ -567,7 +567,7 @@ void CalcLengths(Translator *tr)
 					if (prev->type == phNASAL)
 						p->prepause = 12;
 
-					if (prev->type == phSTOP && !(prev->ph->phflags & phFORTIS))
+					if (prev->type == phSTOP && !(prev->ph->phflags & phVOICELESS))
 						p->prepause = 0;
 				}
 			}
@@ -684,7 +684,7 @@ void CalcLengths(Translator *tr)
 			} else {
 				length_mod = tr->langopts.length_mods[next2type *10+ next->ph->length_mod];
 
-				if ((next->type == phNASAL) && (next2->type == phSTOP || next2->type == phVSTOP) && (next3->ph->phflags & phFORTIS))
+				if ((next->type == phNASAL) && (next2->type == phSTOP || next2->type == phVSTOP) && (next3->ph->phflags & phVOICELESS))
 					length_mod -= 15;
 			}