diff --git a/src/main/java/org/xerial/snappy/SnappyBundleActivator.java b/src/main/java/org/xerial/snappy/SnappyBundleActivator.java
index f36a4f5..1055f58 100755
--- a/src/main/java/org/xerial/snappy/SnappyBundleActivator.java
+++ b/src/main/java/org/xerial/snappy/SnappyBundleActivator.java
@@ -24,12 +24,12 @@
 //--------------------------------------
 package org.xerial.snappy;
 
-import java.util.jar.Manifest;
-
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 
+import java.util.jar.Manifest;
+
 /**
  * OSGi bundle entry point
  * 
@@ -56,5 +56,6 @@ public class SnappyBundleActivator implements BundleActivator
     public void stop(BundleContext context) throws Exception
     {
     	SnappyLoader.setApi(null);
+        Snappy.cleanUp();
     }
 }