diff --git a/Source/themes.cpp b/Source/themes.cpp
index 2146de85a..4ed8b4cb8 100644
--- a/Source/themes.cpp
+++ b/Source/themes.cpp
@@ -2,7 +2,7 @@
 
 int numthemes; // idb
 BOOL armorFlag;
-WORD ThemeGoodIn[4];
+BOOL ThemeGoodIn[4];
 BOOL weaponFlag;
 BOOL treasureFlag;
 BOOL mFountainFlag;
@@ -412,8 +412,8 @@ void InitThemes()
 		return;
 
 	if (leveltype == DTYPE_CATHEDRAL) {
-		for (i = 0; i < sizeof(ThemeGoodIn); i++)
-			ThemeGoodIn[i] = 0;
+		for (i = 0; i < sizeof(ThemeGoodIn) / sizeof(ThemeGoodIn[0]); i++)
+			ThemeGoodIn[i] = FALSE;
 
 		for (i = 0; i < 256 && numthemes < MAXTHEMES; i++) {
 			if (CheckThemeRoom(i)) {
diff --git a/Source/themes.h b/Source/themes.h
index 6a578527b..69d88f921 100644
--- a/Source/themes.h
+++ b/Source/themes.h
@@ -4,7 +4,7 @@
 
 extern int numthemes; // idb
 extern BOOL armorFlag;
-extern WORD ThemeGoodIn[4];
+extern BOOL ThemeGoodIn[4];
 extern BOOL weaponFlag;
 extern BOOL treasureFlag;
 extern BOOL mFountainFlag;