diff --git a/src/main/java/de/tudbut/tools/Lock.java b/src/main/java/de/tudbut/tools/Lock.java
index 7567ea6..c436d8e 100644
--- a/src/main/java/de/tudbut/tools/Lock.java
+++ b/src/main/java/de/tudbut/tools/Lock.java
@@ -50,7 +50,10 @@ public class Lock extends SimpleLock {
      * Wait until unlocked, either by a timer or manually
      */
     public synchronized void waitHere() {
-        super.waitHere(waitTime());
+        long wt = waitTime();
+        if(wt == 0 && lockTime != 0)
+            unlock();
+        super.waitHere(wt);
     }
     
     /**