diff --git a/knots/resource-pool.scm b/knots/resource-pool.scm
index 6b28a27..640978f 100644
--- a/knots/resource-pool.scm
+++ b/knots/resource-pool.scm
@@ -365,7 +365,11 @@
                        ((reply . timeout)
                         (if (and timeout
                                  (< timeout current-internal-time))
-                            (waiter-loop (deq! waiters))
+                            (if (q-empty? waiters)
+                                (loop resources
+                                      (cons resource available)
+                                      waiters)
+                                (waiter-loop (deq! waiters)))
                             (begin
                               (if timeout
                                   (let ((reply-timeout
@@ -795,7 +799,13 @@
                            ((reply . timeout)
                             (if (and timeout
                                      (< timeout current-internal-time))
-                                (waiter-loop (deq! waiters))
+                                (if (q-empty? waiters)
+                                    (loop (cons resource resources)
+                                          (cons resource available)
+                                          waiters
+                                          (cons (get-internal-real-time)
+                                                resources-last-used))
+                                    (waiter-loop (deq! waiters)))
                                 (begin
                                   (if timeout
                                       (let ((reply-timeout
@@ -938,7 +948,19 @@
                        ((reply . timeout)
                         (if (and timeout
                                  (< timeout current-internal-time))
-                            (waiter-loop (deq! waiters))
+                            (if (q-empty? waiters)
+                                (loop resources
+                                      (cons resource available)
+                                      waiters
+                                      (begin
+                                        (list-set!
+                                         resources-last-used
+                                         (list-index (lambda (x)
+                                                       (eq? x resource))
+                                                     resources)
+                                         (get-internal-real-time))
+                                        resources-last-used))
+                                (waiter-loop (deq! waiters)))
                             (begin
                               (if timeout
                                   (let ((reply-timeout