diff --git a/Standard Gaming Platform/vobject.cpp b/Standard Gaming Platform/vobject.cpp
index cd870338..234cd7a3 100644
--- a/Standard Gaming Platform/vobject.cpp	
+++ b/Standard Gaming Platform/vobject.cpp	
@@ -64,7 +64,10 @@
 HLIST		ghVideoObjects = NULL;
 BOOLEAN	gfVideoObjectsInit=FALSE;
 
-#define USE_HASHMAP_FOR_VOBJECTS 
+#ifndef SGP_VIDEO_DEBUGGING
+	#define USE_HASHMAP_FOR_VOBJECTS 
+#endif
+
 #ifdef USE_HASHMAP_FOR_VOBJECTS 
 typedef struct VOBJECT_NODE
 {
diff --git a/Strategic/mapscreen.cpp b/Strategic/mapscreen.cpp
index b81f64b4..e87d4fc6 100644
--- a/Strategic/mapscreen.cpp
+++ b/Strategic/mapscreen.cpp
@@ -4868,9 +4868,9 @@ UINT32 MapScreenHandle(void)
 
 		if(!AddVideoObject(&VObjectDesc, &guiMAPINV))
 		{
-			FilenameForBPP("INTERFACE\\mapinv.sti", VObjectDesc.ImageFile);
+			FilenameForBPP("INTERFACE\\mapinv.sti", VObjectDesc.ImageFile);		
+			CHECKF(AddVideoObject(&VObjectDesc, &guiMAPINV));
 		}
-		CHECKF(AddVideoObject(&VObjectDesc, &guiMAPINV));
 
 		VObjectDesc.fCreateFlags=VOBJECT_CREATE_FROMFILE;
 		FilenameForBPP("INTERFACE\\map_inv_2nd_gun_cover.sti", VObjectDesc.ImageFile);