diff --git a/src/projectM-engine/InitCond.cpp b/src/projectM-engine/InitCond.cpp
index c47927b0d..e8f259e68 100755
--- a/src/projectM-engine/InitCond.cpp
+++ b/src/projectM-engine/InitCond.cpp
@@ -60,6 +60,9 @@ void InitCond::evaluate() {
    assert(this);
    assert(param);
 
+if (param->flags & P_FLAG_USERDEF)
+	return;
+
    /* Set matrix flag to zero. This ensures
      its constant value will be used rather than a matrix value 
   */
diff --git a/src/projectM-engine/Preset.cpp b/src/projectM-engine/Preset.cpp
index 47486952f..82b5b1681 100755
--- a/src/projectM-engine/Preset.cpp
+++ b/src/projectM-engine/Preset.cpp
@@ -63,8 +63,7 @@ Preset::Preset(const std::string & filename, const PresetInputs & presetInputs,
 
   m_presetOutputs.customWaves.clear();
   m_presetOutputs.customShapes.clear();
-  clearMeshChecks();
-
+  
   initialize(filename);
 
 }
diff --git a/src/projectM-engine/Preset.hpp b/src/projectM-engine/Preset.hpp
index 74d4872fd..353b00818 100644
--- a/src/projectM-engine/Preset.hpp
+++ b/src/projectM-engine/Preset.hpp
@@ -156,7 +156,6 @@ private:
   void initialize_PerPixelMeshes();
   int readIn(std::istream & fs);
 
-  inline void clearMeshChecks();
   void preloadInitialize();
   void postloadInitialize();