diff --git a/Core/Samples/src/MultiLayer.cpp b/Core/Samples/src/MultiLayer.cpp
index 4c2b647db3d592a600a627fe2572b71d5b2b4652..213fe319a074215e0835c11e9eef0357700baa60 100644
--- a/Core/Samples/src/MultiLayer.cpp
+++ b/Core/Samples/src/MultiLayer.cpp
@@ -235,16 +235,7 @@ void MultiLayer::setLayerThickness(size_t i_layer, double thickness)
 
 MultiLayerDWBASimulation* MultiLayer::createDWBASimulation() const
 {
-    for (size_t i=0; i<getNumberOfLayers(); ++i) {
-        if( getLayer(i)->hasDWBASimulation() )
-            return new MultiLayerDWBASimulation(this);
-    }
-
-    for(size_t i=0; i<getNumberOfInterfaces(); ++i) {
-        if( getLayerInterface(i)->getRoughness() )
-            return new MultiLayerDWBASimulation(this);
-    }
-    return 0;
+    return new MultiLayerDWBASimulation(this);
 }
 
 int MultiLayer::getIndexOfLayer(const Layer *layer) const