diff --git a/dist/autoloader.js b/dist/autoloader.js
index a8c4155..419fe76 100755
--- a/dist/autoloader.js
+++ b/dist/autoloader.js
@@ -1,4 +1,4 @@
-/*Generated on:Sun Dec 02 2018 10:51:08 GMT+0100 (CET)*/
+/*Generated on:Sun Dec 02 2018 11:00:17 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 a532df8..080c023 100644
--- a/dist/autoloaderV2.js
+++ b/dist/autoloaderV2.js
@@ -1,4 +1,4 @@
-/*Generated on:Sun Dec 02 2018 10:51:08 GMT+0100 (CET)*/
+/*Generated on:Sun Dec 02 2018 11:00:17 GMT+0100 (CET)*/
 /*
  * Dexie.js - a minimalistic wrapper for IndexedDB
  * ===============================================
@@ -18298,7 +18298,9 @@ class AutomaticDispose {
                             done: 'false'
                         }
                         console.log(where);
-                        return self.ADisDB.ADisMissions.where(where).limit(1)
+                        return self.ADisDB.ADisMissions.where(where).and(function (item) {
+                            return item.next_check <= Math.floor(new Date().getTime() / 1000)
+                        }).limit(1)
                     }
                 }).then((Wunsch) => {
                     if (Wunsch !== undefined) {
@@ -18308,13 +18310,15 @@ class AutomaticDispose {
                                     return self.MainHandler()
                                 });
                             } else {
-                                self.RemoveMissionsFromQueue(self.MissionID)
-                                return tellParent(`console.log('wunsch:1000:done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`);
+                                return self.RemoveMissionsFromQueue(self.MissionID).then(() => {
+                                    return tellParent(`console.log('wunsch:1000:done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`);
+                                })
                             }
                         });
                     } else {
-                        self.RemoveMissionsFromQueue(self.MissionID)
-                        return tellParent(`console.log('wunsch:2000:done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`);
+                        return self.RemoveMissionsFromQueue(self.MissionID).then(() => {
+                            return tellParent(`console.log('wunsch:2000:done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`);
+                        })
                     }
                 })
             })
@@ -18326,13 +18330,17 @@ class AutomaticDispose {
         const self = this;
         if (self.includesString($('#iframe-inside-container > div.missionNotFound > div.missionNotFoundText').text(), 'Der Einsatz wurde erfolgreich abgeschlossen.')) {
             console.log("DONE!");
-            self.RemoveMissionsFromQueue(self.MissionID)
-            return tellParent(`console.log('handler:1000:done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`); // delete Mission here as completed
+            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
+            })
         }
         if (self.includesString($('#iframe-inside-container > div.alert.fade.in.alert-success').text(), "wurde erfolgreich informiert") /*|| $('#vehicle_show_table_all input[type="checkbox"]:checked').size() > 0*/ ) {
             console.log("SEND");
-            self.UpdateMissionsToDone(self.MissionID);
-            return tellParent(`console.log('handler:2000:update:${window.name}:${self.MissionID}');`); // update Mission here as updated or full
+            console.log("SEND: " + self.MissionID);
+            return self.UpdateMissionsToDone(self.MissionID).then(() => {
+                return tellParent(`console.log('handler:2000:update:${window.name}:${self.MissionID}');`); // update Mission here as updated or full
+            });
         } else {
             setTimeout(function () {
                 if (['adis-ownmissions', 'adis-krankentransporte'].indexOf(window.name) != -1) {
diff --git a/src/autoloaderV2.js b/src/autoloaderV2.js
index 7971d2e..d5b2403 100644
--- a/src/autoloaderV2.js
+++ b/src/autoloaderV2.js
@@ -1128,7 +1128,9 @@ class AutomaticDispose {
                             done: 'false'
                         }
                         console.log(where);
-                        return self.ADisDB.ADisMissions.where(where).limit(1)
+                        return self.ADisDB.ADisMissions.where(where).and(function (item) {
+                            return item.next_check <= Math.floor(new Date().getTime() / 1000)
+                        }).limit(1)
                     }
                 }).then((Wunsch) => {
                     if (Wunsch !== undefined) {
@@ -1138,13 +1140,15 @@ class AutomaticDispose {
                                     return self.MainHandler()
                                 });
                             } else {
-                                self.RemoveMissionsFromQueue(self.MissionID)
-                                return tellParent(`console.log('wunsch:1000:done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`);
+                                return self.RemoveMissionsFromQueue(self.MissionID).then(() => {
+                                    return tellParent(`console.log('wunsch:1000:done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`);
+                                })
                             }
                         });
                     } else {
-                        self.RemoveMissionsFromQueue(self.MissionID)
-                        return tellParent(`console.log('wunsch:2000:done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`);
+                        return self.RemoveMissionsFromQueue(self.MissionID).then(() => {
+                            return tellParent(`console.log('wunsch:2000:done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`);
+                        })
                     }
                 })
             })
@@ -1156,13 +1160,17 @@ class AutomaticDispose {
         const self = this;
         if (self.includesString($('#iframe-inside-container > div.missionNotFound > div.missionNotFoundText').text(), 'Der Einsatz wurde erfolgreich abgeschlossen.')) {
             console.log("DONE!");
-            self.RemoveMissionsFromQueue(self.MissionID)
-            return tellParent(`console.log('handler:1000:done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`); // delete Mission here as completed
+            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
+            })
         }
         if (self.includesString($('#iframe-inside-container > div.alert.fade.in.alert-success').text(), "wurde erfolgreich informiert") /*|| $('#vehicle_show_table_all input[type="checkbox"]:checked').size() > 0*/ ) {
             console.log("SEND");
-            self.UpdateMissionsToDone(self.MissionID);
-            return tellParent(`console.log('handler:2000:update:${window.name}:${self.MissionID}');`); // update Mission here as updated or full
+            console.log("SEND: " + self.MissionID);
+            return self.UpdateMissionsToDone(self.MissionID).then(() => {
+                return tellParent(`console.log('handler:2000:update:${window.name}:${self.MissionID}');`); // update Mission here as updated or full
+            });
         } else {
             setTimeout(function () {
                 if (['adis-ownmissions', 'adis-krankentransporte'].indexOf(window.name) != -1) {