diff --git a/Plugins/Mineplex.ServerData/src/mineplex/serverdata/data/ServerGroup.java b/Plugins/Mineplex.ServerData/src/mineplex/serverdata/data/ServerGroup.java
index ba3295037..04c2c5118 100644
--- a/Plugins/Mineplex.ServerData/src/mineplex/serverdata/data/ServerGroup.java
+++ b/Plugins/Mineplex.ServerData/src/mineplex/serverdata/data/ServerGroup.java
@@ -325,7 +325,8 @@ public class ServerGroup
 				String serverName = server.getName();
 				try
 				{
-					int serverNum = Integer.parseInt(serverName.split("-")[1]);
+					String[] nameArgs = serverName.split("-");
+					int serverNum = Integer.parseInt(nameArgs[nameArgs.length - 1]);
 					
 					if (serverNum == id)
 					{
diff --git a/Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerMonitor.java b/Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerMonitor.java
index 2bb711a58..086e356f2 100644
--- a/Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerMonitor.java
+++ b/Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerMonitor.java
@@ -211,6 +211,14 @@ public class ServerMonitor
 							
 							System.out.println("Removed MPS : " + groupStatus.getName());
 						}
+						if (groupStatus.getServerType().equalsIgnoreCase("Community"))
+						{
+							_repository.removeServerGroup(groupStatus);
+							_serverGroupMap.remove(groupStatus.getName());
+							groupStatusIterator.remove();
+							
+							System.out.println("Removed MCS : " + groupStatus.getName());
+						}
 					}
 				}
 				
@@ -226,7 +234,8 @@ public class ServerMonitor
 						try
 						{
 							MinecraftServer server = serverIterator.next();
-							int serverNum = Integer.parseInt(server.getName().split("-")[1]);
+							String[] nameArgs = server.getName().split("-");
+							int serverNum = Integer.parseInt(nameArgs[nameArgs.length - 1]);
 							
 							if (serverMap.containsKey(serverNum))
 							{
diff --git a/Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerSorter.java b/Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerSorter.java
index 06ea39063..dd97c296d 100644
--- a/Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerSorter.java
+++ b/Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerSorter.java
@@ -9,9 +9,11 @@ public class ServerSorter implements Comparator<MinecraftServer>
 	@Override
 	public int compare(MinecraftServer first, MinecraftServer second)
 	{
-		if (Integer.parseInt(first.getName().split("-")[1]) < Integer.parseInt(second.getName().split("-")[1]))
+		String[] args1 = first.getName().split("-");
+		String[] args2 = second.getName().split("-");
+		if (Integer.parseInt(args1[args1.length - 1]) < Integer.parseInt(args2[args2.length - 1]))
 			return -1;
-		else if (Integer.parseInt(second.getName().split("-")[1]) < Integer.parseInt(first.getName().split("-")[1]))
+		else if (Integer.parseInt(args2[args2.length - 1]) < Integer.parseInt(args1[args1.length - 1]))
 			return 1;
 
 		return 0;