diff --git a/gradle.properties b/gradle.properties
index 651df110..a907d7df 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-korVersion=0.11.0
-jtranscVersion=0.6.6
-kotlinVersion=1.1.3-2
-vertxVersion=3.3.3
\ No newline at end of file
+korVersion=0.12.0
+jtranscVersion=0.6.7
+kotlinVersion=1.1.4-2
+vertxVersion=3.4.2
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 06ab2e6d..489ed01e 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 54697ac4..eab212b8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Aug 05 14:31:24 CEST 2017
+#Sun Aug 27 17:46:42 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-bin.zip
diff --git a/korio-vertx/src/com/soywiz/korio/vertx/VertxEventLoop.kt b/korio-vertx/src/com/soywiz/korio/vertx/VertxEventLoop.kt
index ff1a47e1..e9015625 100644
--- a/korio-vertx/src/com/soywiz/korio/vertx/VertxEventLoop.kt
+++ b/korio-vertx/src/com/soywiz/korio/vertx/VertxEventLoop.kt
@@ -28,15 +28,22 @@ class VertxEventLoop : EventLoop() {
 	}
 
 	override fun setTimeoutInternal(ms: Int, callback: () -> Unit): Closeable {
-		var done = false
-		val timer = _vertx.setTimer(ms.toLong()) {
-			done = true
-			callback()
-		}
-		return Closeable {
-			if (!done) {
-				done = true
-				_vertx.cancelTimer(timer)
+		if (ms < 1) {
+			var cancelled = false
+			_vertx.runOnContext {
+				if (!cancelled) callback()
+			}
+			return Closeable {
+				cancelled = true
+			}
+		} else {
+			var done = false
+			val timer = _vertx.setTimer(ms.toLong()) { done = true; callback() }
+			return Closeable {
+				if (!done) {
+					done = true
+					_vertx.cancelTimer(timer)
+				}
 			}
 		}
 	}