diff --git a/src/engine/Engine.java b/src/engine/Engine.java
index 731a4c1..9d069cb 100644
--- a/src/engine/Engine.java
+++ b/src/engine/Engine.java
@@ -230,6 +230,7 @@ public class Engine {
                 obj1,
                 obj2,
                 this);
+        this.cameraTrackingBetweenTwoObjectGl();
     }
 
     public void cameraTrackingBetweenTwoObjectGl(){
diff --git a/src/engine/TestEngine.java b/src/engine/TestEngine.java
index 61cbb8c..4aef00e 100644
--- a/src/engine/TestEngine.java
+++ b/src/engine/TestEngine.java
@@ -98,18 +98,18 @@ public class TestEngine {
         if (Joystick1Present){
             gamepad1 = new GamepadInput(GLFW_JOYSTICK_1);
             gamepad1.inputRefresh();
-            List<Integer> listZoomPlus = new ArrayList<>();
-            listZoomPlus.add(InputConst.buttonA);
-            List<Integer> listZoomMinusKeyboard = new ArrayList<>();
-            listZoomMinusKeyboard.add(GLFW_KEY_R);
-            List<Integer> listZoomMinus = new ArrayList<>();
-            listZoomMinus.add(InputConst.buttonB);
-            List<Integer> listZoomPlusKeyboard = new ArrayList<>();
-            listZoomPlusKeyboard.add(GLFW_KEY_F);
-            zoom = new Button("zoom", listZoomPlus, listZoomPlusKeyboard, gamepad1);
-            dezoom = new Button("dezoom", listZoomMinus, listZoomMinusKeyboard, gamepad1);
         }
 
+        List<Integer> listZoomPlus = new ArrayList<>();
+        listZoomPlus.add(InputConst.buttonA);
+        List<Integer> listZoomMinusKeyboard = new ArrayList<>();
+        listZoomMinusKeyboard.add(GLFW_KEY_R);
+        List<Integer> listZoomMinus = new ArrayList<>();
+        listZoomMinus.add(InputConst.buttonB);
+        List<Integer> listZoomPlusKeyboard = new ArrayList<>();
+        listZoomPlusKeyboard.add(GLFW_KEY_F);
+        zoom = new Button("zoom", listZoomPlus, listZoomPlusKeyboard, gamepad1);
+        dezoom = new Button("dezoom", listZoomMinus, listZoomMinusKeyboard, gamepad1);
         engine.translateView(new Vector3f(0.0f, -125.0f, 0.0f));
 
         while (engine.getRunning()) {
@@ -118,13 +118,13 @@ public class TestEngine {
 
             if (Joystick1Present) {
                 gamepad1.inputRefresh();
-                // Check si le personnage a sauté
-                if (zoom.isButtonPressed()){
-                    // Le personnage saute
-                    engine.getCamera().zoom(1.001f);
-                }if(dezoom.isButtonPressed()){
-                    engine.getCamera().zoom(0.999f);
-                }
+            }
+            // Check si le personnage a sauté
+            if (zoom.isButtonPressed()){
+                // Le personnage saute
+                engine.getCamera().zoom(1.001f);
+            }if(dezoom.isButtonPressed()){
+                engine.getCamera().zoom(0.999f);
             }
 
 //            engine.cameraTrackingObjectGl(zangief, -250.0f);
diff --git a/src/engine/camera/TrackingTore.java b/src/engine/camera/TrackingTore.java
index 585e43f..9b059df 100644
--- a/src/engine/camera/TrackingTore.java
+++ b/src/engine/camera/TrackingTore.java
@@ -31,7 +31,7 @@ public class TrackingTore implements TrackingDummy {
         float xPos = this.engine.getViewXPos();
         float dimension = this.engine.getCamera().getDimension();
         float distance = Math.abs(left.getXPos() - right.getXPos()) + right.getWidth() * right.getScalingFactor();
-        float middle_point = (left.getXPos() + right.getXPos() + right.getWidth() * right.getScalingFactor()) / 2;
+        float middle_point = (left.getXPos()  + right.getXPos() + right.getWidth() * right.getScalingFactor()) / 2;
 
         if (left.getXPos() < xPos - rayonExt){
             // Il faut décaler à gauche + dezoom
diff --git a/src/engine/input/Button.java b/src/engine/input/Button.java
index dd63e34..eee7914 100644
--- a/src/engine/input/Button.java
+++ b/src/engine/input/Button.java
@@ -21,9 +21,12 @@ public class Button {
     }
 
     public boolean isButtonPressed(){
-        for (int i : buttonsGamepad){
-            if (controller.checkPressed(i)) return true;
-        } for (int i : buttonsKeyboard){
+        if (controller != null){
+            for (int i : buttonsGamepad){
+                if (controller.checkPressed(i)) return true;
+            }
+        }
+        for (int i : buttonsKeyboard){
             if (glfwGetKey(Engine.getWindow(), i) == 1) return true;
         }
         return false;