diff --git a/Tools/Stat Conversion/src/com/mineplex/statconverter/Main.java b/Tools/Stat Conversion/src/com/mineplex/statconverter/Main.java
index 9d11e0d62..6cb37ba86 100644
--- a/Tools/Stat Conversion/src/com/mineplex/statconverter/Main.java	
+++ b/Tools/Stat Conversion/src/com/mineplex/statconverter/Main.java	
@@ -25,11 +25,19 @@ public class Main
 	
 	private File _info;
 	
+	private boolean _complete = false;
+	
+	private int _nextStart;
+	
 	public Main()
 	{
 		int start = 0;
 		try
 		{
+			if (new File(new File(".").getCanonicalPath() + File.separator + "complete.dat").exists())
+			{
+				return;
+			}
 			_info = new File(new File(".").getCanonicalPath() + File.separator + "converterInfo.dat");
 			System.out.println(_info.getCanonicalPath());
 			if (_info.exists())
@@ -46,7 +54,12 @@ public class Main
 				Files.write("0".getBytes(), _info);
 			}
 			
-			convertGroup(start);
+			_nextStart = start;
+			
+			while (!_complete)
+			{
+				convertGroup(_nextStart);
+			}
 		}
 		catch (IOException e)
 		{
@@ -123,46 +136,49 @@ public class Main
 						s.execute("DELETE FROM accountStat WHERE accountId=" + accountId + ";");
 					}
 				}
-				complete(start);
+				completeGroup(start);
 			}
 			else
 			{
 				System.out.println("[INFO] Conversion complete");
-				while (true)
+				try
 				{
-					try
-					{
-						Thread.sleep(3000);
-					}
-					catch (InterruptedException e)
-					{
-						e.printStackTrace();
-					}
+					new File(new File(".").getCanonicalPath() + File.separator + "complete.dat").createNewFile();
 				}
+				catch (IOException e)
+				{
+					e.printStackTrace();
+				}
+				_complete = true;
 			}
 		}
 		catch (SQLException e)
 		{
 			e.printStackTrace();
+			_complete = true;
 		}
 	}
 	
-	private void complete(int start)
+	private void completeGroup(int start)
 	{
-		int nextStart = start + 10000;
+		_nextStart = start + 10000;
 		if (_info.delete())
 		{
 			try
 			{
 				_info.createNewFile();
-				Files.write((nextStart + "").getBytes(), _info);
-				System.out.println("[INFO] Completed " + start + " to " + (nextStart - 1));
+				Files.write((_nextStart + "").getBytes(), _info);
+				System.out.println("[INFO] Completed " + start + " to " + (_nextStart - 1));
 			}
 			catch (IOException e)
 			{
 				e.printStackTrace();
-				return;
+				_complete = true;
 			}
 		}
+		else
+		{
+			_complete = true;
+		}
 	}
 }
\ No newline at end of file