diff --git a/correlation/src/main/pkg/plugins/Correlation.java b/correlation/src/main/pkg/plugins/Correlation.java
index ec8a491..c7040b8 100644
--- a/correlation/src/main/pkg/plugins/Correlation.java
+++ b/correlation/src/main/pkg/plugins/Correlation.java
@@ -1,4 +1,4 @@
-/*
+    /*
  * Copyright (c) 2014 Paul Scherrer Institute. All rights reserved.
  */
 
@@ -177,7 +177,7 @@ public class Correlation extends Panel {
         checkLinear.setEnabled(state==State.Ready);        
         checkQuadratic.setEnabled(state==State.Ready);        
         
-        if ((former==State.Initializing) && (state == State.Ready)){
+        if ( ((former==null)||(former==State.Initializing)) &&  (state == State.Ready)){
             if (App.hasArgument("start")) {
                 buttonStartActionPerformed(null);
             }