diff --git a/source/src/world.h b/source/src/world.h
index 0e9023874..665ed1b06 100644
--- a/source/src/world.h
+++ b/source/src/world.h
@@ -76,7 +76,7 @@ struct mapstats
             if(!e.attr2) e.attr2 = 255; /* needed for MAPVERSION<=2 */ \
             if(e.attr1>32) e.attr1 = 32; /* 12_03 and below */ \
         } \
-        if(headr.version<6  && strncmp(headr.head,"CUBE",4)==0)  /* only render lights, pl starts and map models on old maps // <6 was <MAPVERSION but we're now at #7 (flowtron) */ \
+        if(strncmp(headr.head,"CUBE",4)==0)  /* only render lights, pl starts and map models on old maps // <6 was <MAPVERSION but we're now at #7 (flowtron) */ \
         { \
             switch(e.type) \
             { \
@@ -110,11 +110,14 @@ struct mapstats
                 case 14: /* old map model */ \
                     e.type=MAPMODEL; \
                     break; \
+                case 18: /* pcube ctf flag */ \
+                    e.type=CTF_FLAG; \
+                    break; \
                 default: \
                     e.type=NOTUSED; \
             } \
         } \
-        if(headr.version>=6 && headr.version<8) { \
+        if(strncmp(headr.head,"CUBE",4)==1 && (headr.version>=6 && headr.version<8)) { \
             if( e.type >= I_HELMET && e.type < (MAXENTTYPES - 1) ) { e.type += 1; } \
         }