diff --git a/dist/autoloader.js b/dist/autoloader.js
index ca80fef..2d42c12 100755
--- a/dist/autoloader.js
+++ b/dist/autoloader.js
@@ -1,4 +1,4 @@
-/*Generated on:Tue Dec 18 2018 01:35:32 GMT+0100 (CET)*/
+/*Generated on:Tue Dec 18 2018 01:51:44 GMT+0100 (CET)*/
 var AutomaticDispose_Branch = "master";
 var AutomaticDispose_URL = "https://jf.git.rest/Jomaar/automatic-dispose/raw/branch/";
 var da_lss_adis_time = new Date().getTime();
diff --git a/dist/autoloaderV2.js b/dist/autoloaderV2.js
index 5855322..6b0b031 100644
--- a/dist/autoloaderV2.js
+++ b/dist/autoloaderV2.js
@@ -1,4 +1,4 @@
-/*Generated on:Tue Dec 18 2018 01:35:32 GMT+0100 (CET)*/
+/*Generated on:Tue Dec 18 2018 01:51:44 GMT+0100 (CET)*/
 /*
  * Dexie.js - a minimalistic wrapper for IndexedDB
  * ===============================================
@@ -18386,7 +18386,7 @@ class AutomaticDispose {
         const runnerID = self.ADisSettings.runner_iframesName.indexOf(window.name);
         self.MyRunner = self.ADisSettings.runner[runnerID];
         self.MyRunnerSettings = self.ADisSettings.runner_settings[runnerID];
-        setTimeout(function () {
+
             self.MissionID = document.location.pathname.substr(document.location.pathname.lastIndexOf("/") + 1);
             var help_el = $('a#mission_help');
             if (help_el.length > 0) {
@@ -18445,19 +18445,18 @@ class AutomaticDispose {
                     })
                 })
             // }
-        }, 100);
     }
 
 
     MainHandler() {
         const self = this;
-        if (self.includesString($('#iframe-inside-container > div.missionNotFound > div.missionNotFoundText').text(), 'Der Einsatz wurde erfolgreich abgeschlossen.')) {
+        if (self.MissionType == null || self.includesString($('#iframe-inside-container > div.missionNotFound > div.missionNotFoundText').text(), 'Der Einsatz wurde erfolgreich abgeschlossen.')) {
             console.log("DONE!");
             console.log("DONE: ", self.MissionID);
             return self.RemoveMissionsFromQueue(self.MissionID).then(() => {
                 return tellParent(`console.log('handler:1000:done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`); // delete Mission here as completed
             })
-        } else if (self.includesString($('#iframe-inside-container > div.alert.fade.in.alert-success').text(), "wurde erfolgreich informiert") /*|| $('#vehicle_show_table_all input[type="checkbox"]:checked').length > 0*/ ) {
+        } else if (self.includesString($('#iframe-inside-container > div.alert.fade.in.alert-success').text(), "wurde erfolgreich informiert") ) {
             console.log("SEND");
             console.log("SEND: ", self.MissionID);
             return self.UpdateMissionsToDone(self.MissionID).then(() => {
diff --git a/src/autoloaderV2.js b/src/autoloaderV2.js
index 50c4b36..b00212e 100644
--- a/src/autoloaderV2.js
+++ b/src/autoloaderV2.js
@@ -1145,7 +1145,7 @@ class AutomaticDispose {
         const runnerID = self.ADisSettings.runner_iframesName.indexOf(window.name);
         self.MyRunner = self.ADisSettings.runner[runnerID];
         self.MyRunnerSettings = self.ADisSettings.runner_settings[runnerID];
-        setTimeout(function () {
+
             self.MissionID = document.location.pathname.substr(document.location.pathname.lastIndexOf("/") + 1);
             var help_el = $('a#mission_help');
             if (help_el.length > 0) {
@@ -1204,19 +1204,18 @@ class AutomaticDispose {
                     })
                 })
             // }
-        }, 100);
     }
 
 
     MainHandler() {
         const self = this;
-        if (self.includesString($('#iframe-inside-container > div.missionNotFound > div.missionNotFoundText').text(), 'Der Einsatz wurde erfolgreich abgeschlossen.')) {
+        if (self.MissionType == null || self.includesString($('#iframe-inside-container > div.missionNotFound > div.missionNotFoundText').text(), 'Der Einsatz wurde erfolgreich abgeschlossen.')) {
             console.log("DONE!");
             console.log("DONE: ", self.MissionID);
             return self.RemoveMissionsFromQueue(self.MissionID).then(() => {
                 return tellParent(`console.log('handler:1000:done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`); // delete Mission here as completed
             })
-        } else if (self.includesString($('#iframe-inside-container > div.alert.fade.in.alert-success').text(), "wurde erfolgreich informiert") /*|| $('#vehicle_show_table_all input[type="checkbox"]:checked').length > 0*/ ) {
+        } else if (self.includesString($('#iframe-inside-container > div.alert.fade.in.alert-success').text(), "wurde erfolgreich informiert") ) {
             console.log("SEND");
             console.log("SEND: ", self.MissionID);
             return self.UpdateMissionsToDone(self.MissionID).then(() => {