diff --git a/Source/themes.cpp b/Source/themes.cpp
index b3f04db77..cbc333d6b 100644
--- a/Source/themes.cpp
+++ b/Source/themes.cpp
@@ -283,41 +283,41 @@ BOOL SpecialThemeFit(int i, int t)
 	case THEME_BLOODFOUNTAIN:
 		if (rv) {
 			rv = TFit_Obj5(i);
-			if (rv) {
-				bFountainFlag = FALSE;
-			}
+		}
+		if (rv) {
+			bFountainFlag = FALSE;
 		}
 		break;
 	case THEME_PURIFYINGFOUNTAIN:
 		if (rv) {
 			rv = TFit_Obj5(i);
-			if (rv) {
-				pFountainFlag = FALSE;
-			}
+		}
+		if (rv) {
+			pFountainFlag = FALSE;
 		}
 		break;
 	case THEME_MURKYFOUNTAIN:
 		if (rv) {
 			rv = TFit_Obj5(i);
-			if (rv) {
-				mFountainFlag = FALSE;
-			}
+		}
+		if (rv) {
+			mFountainFlag = FALSE;
 		}
 		break;
 	case THEME_TEARFOUNTAIN:
 		if (rv) {
 			rv = TFit_Obj5(i);
-			if (rv) {
-				tFountainFlag = FALSE;
-			}
+		}
+		if (rv) {
+			tFountainFlag = FALSE;
 		}
 		break;
 	case THEME_CAULDRON:
 		if (rv) {
 			rv = TFit_Obj5(i);
-			if (rv) {
-				cauldronFlag = FALSE;
-			}
+		}
+		if (rv) {
+			cauldronFlag = FALSE;
 		}
 		break;
 	case THEME_GOATSHRINE:
@@ -336,7 +336,7 @@ BOOL SpecialThemeFit(int i, int t)
 		break;
 	case THEME_TREASURE:
 		rv = treasureFlag;
-		if (treasureFlag) {
+		if (rv) {
 			treasureFlag = FALSE;
 		}
 		break;