diff --git a/portainer_agent/config.json b/portainer_agent/config.json
index 64234c817..bea7dac4d 100644
--- a/portainer_agent/config.json
+++ b/portainer_agent/config.json
@@ -47,5 +47,5 @@
   },
   "slug": "portainer_agent",
   "url": "https://github.com/alexbelgium/hassio-addons",
-  "version": "2.18.2"
+  "version": "2.18.2-test2"
 }
\ No newline at end of file
diff --git a/portainer_agent/rootfs/etc/cont-init.d/99-run.sh b/portainer_agent/rootfs/etc/cont-init.d/99-run.sh
index b67e02896..d6f09e7b9 100755
--- a/portainer_agent/rootfs/etc/cont-init.d/99-run.sh
+++ b/portainer_agent/rootfs/etc/cont-init.d/99-run.sh
@@ -7,7 +7,7 @@
 bashio::require.unprotected
 
 # Wait for transmission to become available
-bashio::net.wait_for 9001 localhost 900
+bashio::net.wait_for 9001 localhost 50
 
 # Launch app
 cd /app || true
diff --git a/portainer_agent/rootfs/usr/sbin/wait-for-signal b/portainer_agent/rootfs/usr/sbin/wait-for-signal
index 8be4066ee..a50cfb698 100644
--- a/portainer_agent/rootfs/usr/sbin/wait-for-signal
+++ b/portainer_agent/rootfs/usr/sbin/wait-for-signal
@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bashio
 
-START_TIME=`date +%s`
+START_TIME="$(date +%s)"
 
 echo "Waiting for first healthcheck execution (max $FIRST_HEALTHCHECK_TIMEOUT seconds)..."
 
@@ -8,7 +8,7 @@ while [ ! -f "/tmp/healthcheck-signal" ];
 do
   sleep 1
 
-  ELAPSED_TIME=`expr \`date +%s\` - $START_TIME`
+  ELAPSED_TIME="$(expr \date +%s\ - $START_TIME)"
 
   if [ $ELAPSED_TIME -gt $FIRST_HEALTHCHECK_TIMEOUT ]
   then