diff --git a/boulder-dash/src/fr/enssat/BoulderDash/models/LevelModel.java b/boulder-dash/src/fr/enssat/BoulderDash/models/LevelModel.java
index 0663d27c..ca2ecbf0 100644
--- a/boulder-dash/src/fr/enssat/BoulderDash/models/LevelModel.java
+++ b/boulder-dash/src/fr/enssat/BoulderDash/models/LevelModel.java
@@ -62,18 +62,16 @@ public class LevelModel extends Observable implements Runnable {
 	/**
 	 * Class constructor
 	 *
-	 * @param  levelName        Level name
 	 * @param  audioLoadHelper  Audio load helper
      * @param  mode             Instance mode
 	 */
-	public LevelModel(String levelName, AudioLoadHelper audioLoadHelper, String mode) {
-		this.levelName = levelName;
+	public LevelModel(LevelLoadHelper levelLoadHelper, AudioLoadHelper audioLoadHelper, String mode) {
 		this.audioLoadHelper = audioLoadHelper;
 		this.gamePaused = false;
 		this.gameRunning = true;
 		this.mode = mode;
 
-		setLevelLoadHelper(new LevelLoadHelper(this.levelName));
+		setLevelLoadHelper(levelLoadHelper);
 
 		this.cursorModel = new CursorModel();
 		this.createLimits();
@@ -91,7 +89,7 @@ public class LevelModel extends Observable implements Runnable {
      * @param  audioLoadHelper  Audio load helper
      */
     public LevelModel(String levelName, AudioLoadHelper audioLoadHelper) {
-        this(levelName, audioLoadHelper, "game");
+        this(new LevelLoadHelper(levelName), audioLoadHelper, "game");
     }
 
 	/**
diff --git a/boulder-dash/src/fr/enssat/BoulderDash/views/LevelEditorView.java b/boulder-dash/src/fr/enssat/BoulderDash/views/LevelEditorView.java
index d6e5557a..35ff7107 100644
--- a/boulder-dash/src/fr/enssat/BoulderDash/views/LevelEditorView.java
+++ b/boulder-dash/src/fr/enssat/BoulderDash/views/LevelEditorView.java
@@ -5,6 +5,7 @@ import java.awt.*;
 import java.util.Observable;
 import java.util.Observer;
 
+import fr.enssat.BoulderDash.helpers.LevelLoadHelper;
 import fr.enssat.BoulderDash.helpers.LevelSelectorHelper;
 import fr.enssat.BoulderDash.controllers.LevelEditorController;
 import fr.enssat.BoulderDash.controllers.NavigationBetweenViewController;
@@ -169,7 +170,7 @@ public class LevelEditorView extends JFrame implements Observer {
 
         if(selectedLevelValue != null && !selectedLevelValue.isEmpty()) {
             // Load existing model
-            pickedLevelModel = new LevelModel(selectedLevelValue, this.nav.getAudioLoadHelper(), "editor");
+            pickedLevelModel = new LevelModel(new LevelLoadHelper(selectedLevelValue), this.nav.getAudioLoadHelper(), "editor");
         } else {
             // New blank model for editor
             pickedLevelModel = new LevelModel(this.nav.getAudioLoadHelper());