diff --git a/src/p_setup.c b/src/p_setup.c
index 240a93ab7..ab3b8b306 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -8366,8 +8366,8 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate)
 	if (mapheaderinfo[gamemap-1])
 	{
 		encoreLump = vres_Find(curmapvirt, encoremode ? "ENCORE" : "TWEAKMAP");
-		if (!encoreLump && strlen(maplumpname) < 8)
-			oldEncore = W_CheckNumForName(va("%s%c", maplumpname, encoremode ? 'E' : 'T'));
+		if (!encoreLump)
+			oldEncore = W_CheckNumForLongName(va("%s%c", maplumpname, encoremode ? 'E' : 'T'));
 	}
 
 	if (encoreLump)