diff --git a/src/game/gamecore.cpp b/src/game/gamecore.cpp
index 8155cae5f..e4452af91 100644
--- a/src/game/gamecore.cpp
+++ b/src/game/gamecore.cpp
@@ -576,7 +576,7 @@ void CCharacterCore::Quantize()
 bool CCharacterCore::IsRightTeam(int MapIndex)
 {
 	if(Collision()->m_pSwitchers)
-		if(m_pTeams->Team(m_Id) != m_pTeams->m_IsDDRace16 ? VANILLA_TEAM_SUPER : TEAM_SUPER)
+		if(m_pTeams->Team(m_Id) != (m_pTeams->m_IsDDRace16 ? VANILLA_TEAM_SUPER : TEAM_SUPER))
 			return Collision()->m_pSwitchers[Collision()->GetDTileNumber(MapIndex)].m_Status[m_pTeams->Team(m_Id)];
 	return false;
 }
diff --git a/src/game/teamscore.cpp b/src/game/teamscore.cpp
index ca453bda7..9e0047f0d 100644
--- a/src/game/teamscore.cpp
+++ b/src/game/teamscore.cpp
@@ -23,7 +23,7 @@ void CTeamsCore::Team(int ClientID, int Team)
 
 bool CTeamsCore::CanCollide(int ClientID1, int ClientID2)
 {
-	if (m_Team[ClientID1] == m_IsDDRace16 ? VANILLA_TEAM_SUPER : TEAM_SUPER || m_Team[ClientID2] == m_IsDDRace16 ? VANILLA_TEAM_SUPER : TEAM_SUPER
+	if (m_Team[ClientID1] == (m_IsDDRace16 ? VANILLA_TEAM_SUPER : TEAM_SUPER) || m_Team[ClientID2] == (m_IsDDRace16 ? VANILLA_TEAM_SUPER : TEAM_SUPER)
 			|| ClientID1 == ClientID2)
 		return true;
 	if (m_IsSolo[ClientID1] || m_IsSolo[ClientID2])