diff --git a/src/eva2/server/go/operators/mutation/PropertyMutationMixer.java b/src/eva2/server/go/operators/mutation/PropertyMutationMixer.java
index f9a25927..a91fb05f 100644
--- a/src/eva2/server/go/operators/mutation/PropertyMutationMixer.java
+++ b/src/eva2/server/go/operators/mutation/PropertyMutationMixer.java
@@ -16,12 +16,11 @@ public class PropertyMutationMixer implements java.io.Serializable {
     public String                           m_WeightsLabel          = "-";
     public boolean                          m_NormalizationEnabled  = true;
 
-    public PropertyMutationMixer(InterfaceMutation[] d, boolean selectAllOrNone) {
+    public PropertyMutationMixer(InterfaceMutation[] d) {
         this.m_Weights = new double[d.length];
         for (int i = 0; i < d.length; i++) this.m_Weights[i] = 1/((double)d.length);
         this.m_AvailableTargets = d;
-        if (selectAllOrNone) this.m_SelectedTargets  = d.clone();
-        else this.m_SelectedTargets = null;
+        this.m_SelectedTargets  = null;
     }
     public PropertyMutationMixer(PropertyMutationMixer d) {
         this.m_DescriptiveString        = d.m_DescriptiveString;
diff --git a/src/eva2/server/go/operators/mutation/PropertyMutationMixerEditor.java b/src/eva2/server/go/operators/mutation/PropertyMutationMixerEditor.java
index 019f1cd7..04cd99e4 100644
--- a/src/eva2/server/go/operators/mutation/PropertyMutationMixerEditor.java
+++ b/src/eva2/server/go/operators/mutation/PropertyMutationMixerEditor.java
@@ -401,13 +401,11 @@ public class PropertyMutationMixerEditor extends JPanel implements PropertyEdito
     /********************************* java.beans.PropertyChangeListener *************************/
 
     public void addPropertyChangeListener(PropertyChangeListener l) {
-  	  if (m_Support == null) m_Support = new PropertyChangeSupport(this);
-  	  m_Support.addPropertyChangeListener(l);
+        m_Support.addPropertyChangeListener(l);
     }
 
     public void removePropertyChangeListener(PropertyChangeListener l) {
-  	  if (m_Support == null) m_Support = new PropertyChangeSupport(this);
-  	  m_Support.removePropertyChangeListener(l);
+        m_Support.removePropertyChangeListener(l);
     }
     /** This will wait for the GenericObjectEditor to finish
      * editing an object.