diff --git a/SparkleLib/SparkleRepo.cs b/SparkleLib/SparkleRepo.cs
index 85720d6e..03171709 100644
--- a/SparkleLib/SparkleRepo.cs
+++ b/SparkleLib/SparkleRepo.cs
@@ -1182,7 +1182,7 @@ namespace SparkleLib {
 			LocalTimer.Dispose ();
 			Listener.Dispose ();
 
-			base.Dispose ();
+			//base.Dispose ();
 
 		}
 
diff --git a/SparkleShare/SparkleController.cs b/SparkleShare/SparkleController.cs
index 49926724..b6f976d2 100644
--- a/SparkleShare/SparkleController.cs
+++ b/SparkleShare/SparkleController.cs
@@ -1268,11 +1268,9 @@ namespace SparkleShare {
 		public void Quit ()
 		{
 
-			// FIXME: this blocks
-//			foreach (SparkleRepo repo in Repositories)
-//				repo.Dispose ();
+			foreach (SparkleRepo repo in Repositories)
+				repo.Dispose ();
 
-			// FIXME: Never exits
 			Environment.Exit (0);
 
 		}