diff --git a/src/main/java/app/SimulatorApplication.java b/src/main/java/app/SimulatorApplication.java
index 9f65df16fddd15951c5f8814ba81e32ec588aedf..0c0f59a3567d194428a9d4272d4e04326548d2cc 100644
--- a/src/main/java/app/SimulatorApplication.java
+++ b/src/main/java/app/SimulatorApplication.java
@@ -27,7 +27,7 @@ public class SimulatorApplication extends javafx.application.Application {
   public static final int PAPER_COUNT = 10;
   public static final int ROCK_COUNT = 10;
   public static final int CISOR_COUNT = 10;
-  public static final int DOCTOR_COUNT = 10;
+  public static final int DOCTOR_COUNT = 3;
   public static final int PATIENT_COUNT = 70;
   public static final int VIRUS_COUNT = 6;
 
@@ -56,6 +56,9 @@ public class SimulatorApplication extends javafx.application.Application {
     loader.setLocation(location);
     view = loader.load();
     Controller controller = loader.getController();
+    try{
+
+    
     if(SimulatorApplication.arguments == null){
       SimulatorApplication.arguments = new String[1];
       SimulatorApplication.arguments[0] = "firefighter";
@@ -72,7 +75,9 @@ public class SimulatorApplication extends javafx.application.Application {
         controller.initializeDoctor();
         break;
     }
-
+  }catch(ArrayIndexOutOfBoundsException e){
+    controller.initializeFireFighter();
+  }
   }
 
   private void showScene() {
diff --git a/src/main/java/controller/Controller.java b/src/main/java/controller/Controller.java
index 757a486176cf0775bad27bb76d101f3d44005c57..f663d0a42e6b32761bd11191ce2b0a8a3a5303e1 100644
--- a/src/main/java/controller/Controller.java
+++ b/src/main/java/controller/Controller.java
@@ -132,6 +132,7 @@ public class Controller {
   }
 
   public void initializeDoctor() {
+    
     System.out.println("Initializing doctor virus patient");
     int columnCount = SimulatorApplication.COLUMN_COUNT;
     int rowCount = SimulatorApplication.ROW_COUNT;