diff --git a/Server/static/js/main.js b/Server/static/js/main.js
index 8bd430c..b2d17c4 100644
--- a/Server/static/js/main.js
+++ b/Server/static/js/main.js
@@ -246,7 +246,7 @@ function askPermission(text, func) {
     Ply.dialog("confirm",
         {},
         text
-    ).done(function (e) {
+    ).always(function (e) {
         if (e.state) {
             func();
         }
diff --git a/Server/web_server_models.py b/Server/web_server_models.py
index 72974bf..74a8cec 100644
--- a/Server/web_server_models.py
+++ b/Server/web_server_models.py
@@ -1,8 +1,9 @@
-from server import Client
+from time import time
 
 copters = []
 delay = 0
 
+
 def set_delay_manually(_delay):
     global delay
     delay = _delay
@@ -30,8 +31,9 @@ class WebCopter:
         self.client.get_response("cell_voltage", save, callback_args=(self, 'cell_voltage'))
         self.client.get_response("selfcheck", save, callback_args=(self, 'selfcheck'))
         t1 = self.time
+        time_started = time()
         self.client.get_response("time", save, callback_args=(self, 'time'))
-        while t1 == self.time:
+        while t1 == self.time and time() - time_started < 5:
             pass