diff --git a/L2J_DataPack/dist/game/data/scripts/handlers/communityboard/ClanBoard.java b/L2J_DataPack/dist/game/data/scripts/handlers/communityboard/ClanBoard.java
index f8a554d76cbd7b6d29123c62b88710e1e7793aee..24b8e618ba9a3877fd38abea0c2c3aeb26383d74 100644
--- a/L2J_DataPack/dist/game/data/scripts/handlers/communityboard/ClanBoard.java
+++ b/L2J_DataPack/dist/game/data/scripts/handlers/communityboard/ClanBoard.java
@@ -217,9 +217,8 @@ public class ClanBoard implements IWriteBoardHandler
 		}
 		
 		i = 0;
-		int nbp;
-		nbp = ClanTable.getInstance().getClans().length / 8;
-		if ((nbp * 8) != ClanTable.getInstance().getClans().length)
+		int nbp = ClanTable.getInstance().getClanCount() / 8;
+		if ((nbp * 8) != ClanTable.getInstance().getClanCount())
 		{
 			nbp++;
 		}
diff --git a/L2J_DataPack/dist/game/data/scripts/handlers/communityboard/HomeBoard.java b/L2J_DataPack/dist/game/data/scripts/handlers/communityboard/HomeBoard.java
index 24e4920b4a9694d39593dac2083aecd96e65d26b..29e36f75ba7092b641b43505251167dcbb5bed95 100644
--- a/L2J_DataPack/dist/game/data/scripts/handlers/communityboard/HomeBoard.java
+++ b/L2J_DataPack/dist/game/data/scripts/handlers/communityboard/HomeBoard.java
@@ -58,9 +58,9 @@ public final class HomeBoard implements IParseBoardHandler
 			CommunityBoardHandler.getInstance().addBypass(activeChar, "Home", command);
 			
 			String html = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/CommunityBoard/home.html");
-			html = html.replaceAll("%fav_count%", String.valueOf(getFavoriteCount(activeChar)));
-			html = html.replaceAll("%region_count%", String.valueOf(getRegionCount(activeChar)));
-			html = html.replaceAll("%clan_count%", String.valueOf(getClansCount()));
+			html = html.replaceAll("%fav_count%", Integer.toString(getFavoriteCount(activeChar)));
+			html = html.replaceAll("%region_count%", Integer.toString(getRegionCount(activeChar)));
+			html = html.replaceAll("%clan_count%", Integer.toString(ClanTable.getInstance().getClanCount()));
 			CommunityBoardHandler.separateAndSend(html, activeChar);
 		}
 		else if (command.startsWith("_bbstop;"))
@@ -111,13 +111,4 @@ public final class HomeBoard implements IParseBoardHandler
 	{
 		return 0; // TODO: Implement.
 	}
-	
-	/**
-	 * Gets the clans count.
-	 * @return the clans count
-	 */
-	private static int getClansCount()
-	{
-		return ClanTable.getInstance().getClans().length;
-	}
 }