diff --git a/client/windows/CCastleInterface.cpp b/client/windows/CCastleInterface.cpp
index 8e620b614..703ab532b 100644
--- a/client/windows/CCastleInterface.cpp
+++ b/client/windows/CCastleInterface.cpp
@@ -1063,7 +1063,7 @@ void CCastleBuildings::enterBank()
 	std::vector<std::shared_ptr<CComponent>> components;
 	if(town->bonusValue.second > 0)
 	{
-		components.push_back(std::make_shared<CComponent>(ComponentType::RESOURCE, GameResID(GameResID::GOLD), "-500/" + CGI->generaltexth->translate("core.genrltxt.64")));
+		components.push_back(std::make_shared<CComponent>(ComponentType::RESOURCE_PER_DAY, GameResID(GameResID::GOLD), -500));
 		LOCPLINT->showInfoDialog(CGI->generaltexth->translate("vcmi.townStructure.bank.payBack"), components);
 	}
 	else{
diff --git a/server/CGameHandler.cpp b/server/CGameHandler.cpp
index c0f4cbe0d..ddffc86b6 100644
--- a/server/CGameHandler.cpp
+++ b/server/CGameHandler.cpp
@@ -2473,12 +2473,7 @@ bool CGameHandler::triggerTownSpecialBuildingAction(ObjectInstanceID tid, Buildi
 {
 	const CGTownInstance * t = getTown(tid);
 
-	bool hasBuilding = false;
-	for (auto building : t->town->buildings)
-		if(vstd::contains(t->builtBuildings, building.first) && building.second->subId == sid)
-			hasBuilding = true;
-
-	if(!hasBuilding)
+	if(t->town->getBuildingType(sid) == BuildingID::NONE)
 		return false;
 
 	if(sid == BuildingSubID::EBuildingSubID::BANK)