diff --git a/s3s.py b/s3s.py
index fb5f3fd..99f89af 100755
--- a/s3s.py
+++ b/s3s.py
@@ -585,8 +585,10 @@ def prepare_battle_result(battle, ismonitoring, overview_data=None):
 					if child["id"] == battle["id"]: # found the battle ID in the other file
 
 						full_rank = re.split('([0-9]+)', child["udemae"].lower())
+						s_plus_before = len(full_rank) > 1 #True if "before" rank is s+
+						
 						payload["rank_before"] = full_rank[0]
-						if len(full_rank) > 1:
+						if s_plus_before:
 							payload["rank_before_s_plus"] = int(full_rank[1])
 
 						# anarchy battle (series) - not open
@@ -603,7 +605,7 @@ def prepare_battle_result(battle, ismonitoring, overview_data=None):
 
 							if parent["bankaraMatchChallenge"]["udemaeAfter"] is None:
 								payload["rank_after"] = payload["rank_before"]
-								if payload["rank_before_s_plus"]:
+								if s_plus_before:
 									payload["rank_after_s_plus"] = payload["rank_before_s_plus"]
 							else:
 								if idx != 0: