diff --git a/plugins/ProsilicaShutdown.java b/plugins/ProsilicaShutdown.java
index 417d60d..798135b 100644
--- a/plugins/ProsilicaShutdown.java
+++ b/plugins/ProsilicaShutdown.java
@@ -28,11 +28,9 @@ public class ProsilicaShutdown implements Plugin {
     public void onStateChange(State state, State former) {
         System.out.print(former + " -> ");
         System.out.println(state);
-        //ch.psi.pshell.prosilica.Prosilica.shutdown();
-    }
-
-    @Override
-    public void onExecutedFile(String fileName, Object result) {
+        if ((state==State.Initializing) && (former!=null) && (former.isInitialized())){
+            ch.psi.pshell.prosilica.Prosilica.shutdown();
+            getLogger().warning("Shutting down Prosilica");
+        }
     }    
-    
 }