diff --git a/src/projectM-engine/Preset.cpp b/src/projectM-engine/Preset.cpp
index 1d4756b15..72433c392 100755
--- a/src/projectM-engine/Preset.cpp
+++ b/src/projectM-engine/Preset.cpp
@@ -54,9 +54,7 @@ Preset::Preset(const std::string & filename, const PresetInputs & presetInputs,
 
 Preset::~Preset()
 {
-  /// testing
-  customWaves->clear();
-  customShapes->clear();
+
   Algorithms::traverse<Algorithms::TraverseFunctors::DeleteFunctor<InitCond> >(init_cond_tree);
 
   Algorithms::traverse<Algorithms::TraverseFunctors::DeleteFunctor<InitCond> >(per_frame_init_eqn_tree);
@@ -80,6 +78,10 @@ Preset::~Preset()
     delete(pos->second);
   }
 
+  /// testing
+  customWaves->clear();
+  customShapes->clear();
+
 }
 
 /* Adds a per pixel equation according to its string name. This