diff --git a/AUTHORS b/AUTHORS
index 70d816aa..ab05561e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -8,6 +8,7 @@ Bernd Prager <bernd@prager.ws>
 Bernd Melchers <melchers@ZEDAT.FU-Berlin.DE>
 Brian Buchanan <bwb@holo.org>
 Chris Wong <chris@chriswongstudio.com>
+Christian Gudrian <christian.gudrian@fluidon.com>
 Conrad D. Steenberg <conrad.steenberg@caltech.edu>
 Dhammika Pathirana <dhammika@gmail.com>
 Dhruva Krishnamurthy <dhruva@ymail.com>
diff --git a/src/select.cpp b/src/select.cpp
index ae2ffe2f..3a7cd818 100644
--- a/src/select.cpp
+++ b/src/select.cpp
@@ -147,14 +147,14 @@ void zmq::select_t::loop ()
 {
     while (!stopping) {
 
+        //  Execute any due timers.
+        uint64_t timeout = execute_timers ();
+
         //  Intialise the pollsets.
         memcpy (&readfds, &source_set_in, sizeof source_set_in);
         memcpy (&writefds, &source_set_out, sizeof source_set_out);
         memcpy (&exceptfds, &source_set_err, sizeof source_set_err);
 
-        //  Execute any due timers.
-        uint64_t timeout = execute_timers ();
-
         //  Wait for events.
         struct timeval tv = {(long) (timeout / 1000),
             (long) (timeout % 1000 * 1000)};