diff --git a/handler/beatleader/beatleader.go b/handler/beatleader/beatleader.go
index a7e3f8b..2845966 100644
--- a/handler/beatleader/beatleader.go
+++ b/handler/beatleader/beatleader.go
@@ -102,8 +102,12 @@ func blPlus(msg model.Message) (reply *model.Reply) {
 			FromMsg:        msg,
 		}
 	}
-	if userInfo.CountryRank-N < 0 {
-		resultStr.WriteString(fmt.Sprintf("注意：你最多只需要提升%d名就是%s区Top1了。\n", userInfo.CountryRank-1, userInfo.Country))
+	if userInfo.CountryRank-N <= 0 {
+		if userInfo.CountryRank == 1 {
+			resultStr.WriteString(fmt.Sprintf("注意：你已经是%s区Top1了。\n", userInfo.Country))
+		} else {
+			resultStr.WriteString(fmt.Sprintf("注意：你最多只需要提升%d名就是%s区Top1了。\n", userInfo.CountryRank-1, userInfo.Country))
+		}
 	}
 	//寻找leaderboard中排名为userInfo.CountryRank-N的玩家
 	var targetPlayer beatleader.PlayerDataLite
@@ -118,7 +122,7 @@ func blPlus(msg model.Message) (reply *model.Reply) {
 		}
 	}
 	if isPlus {
-		resultStr.WriteString(fmt.Sprintf("您只需要再打出%.2fpp就能超越%s,达到%s区第%d名。", targetPlayer.PP-userInfo.PP, targetPlayer.Name, userInfo.Country, targetPlayer.CountryRank))
+		resultStr.WriteString(fmt.Sprintf("您只需要再打出%.2fpp就能超越%s，达到%s区第%d名。", targetPlayer.PP-userInfo.PP, targetPlayer.Name, userInfo.Country, targetPlayer.CountryRank))
 	} else {
 		resultStr.WriteString(fmt.Sprintf("%s区的第%d名是%s，对方只需要再打出%.2fpp就能超过你。", userInfo.Country, targetPlayer.CountryRank, targetPlayer.Name, userInfo.PP-targetPlayer.PP))
 	}
diff --git a/handler/scoresaber/score.go b/handler/scoresaber/score.go
index 8f18f10..1ef375b 100644
--- a/handler/scoresaber/score.go
+++ b/handler/scoresaber/score.go
@@ -100,8 +100,12 @@ func ssPlusN(msg model.Message) (reply *model.Reply) {
 			FromMsg:        msg,
 		}
 	}
-	if userInfo.CountryRank-N < 0 {
-		resultStr.WriteString(fmt.Sprintf("注意：你最多只需要提升%d名就是%s区Top1了。\n", userInfo.CountryRank-1, userInfo.Country))
+	if userInfo.CountryRank-N <= 0 {
+		if userInfo.CountryRank == 1 {
+			resultStr.WriteString(fmt.Sprintf("注意：你已经是%s区Top1了。\n", userInfo.Country))
+		} else {
+			resultStr.WriteString(fmt.Sprintf("注意：你最多只需要提升%d名就是%s区Top1了。\n", userInfo.CountryRank-1, userInfo.Country))
+		}
 	}
 	//寻找leaderboard中排名为userInfo.CountryRank-N的玩家
 	var targetPlayer scoresaber.PlayerData
@@ -116,7 +120,7 @@ func ssPlusN(msg model.Message) (reply *model.Reply) {
 		}
 	}
 	if isPlus {
-		resultStr.WriteString(fmt.Sprintf("您只需要再打出%.2fpp就能超越%s,达到%s区第%d名。", targetPlayer.PP-userInfo.PP, targetPlayer.Name, userInfo.Country, targetPlayer.CountryRank))
+		resultStr.WriteString(fmt.Sprintf("您只需要再打出%.2fpp就能超越%s，达到%s区第%d名。", targetPlayer.PP-userInfo.PP, targetPlayer.Name, userInfo.Country, targetPlayer.CountryRank))
 	} else {
 		resultStr.WriteString(fmt.Sprintf("%s区的第%d名是%s，对方只需要再打出%.2fpp就能超过你。", userInfo.Country, targetPlayer.CountryRank, targetPlayer.Name, userInfo.PP-targetPlayer.PP))
 	}