diff --git a/fairmq/examples/5-req-rep/FairMQExample5Server.cxx b/fairmq/examples/5-req-rep/FairMQExample5Server.cxx
index 9f47c75f..e1c600f4 100644
--- a/fairmq/examples/5-req-rep/FairMQExample5Server.cxx
+++ b/fairmq/examples/5-req-rep/FairMQExample5Server.cxx
@@ -33,8 +33,6 @@ void FairMQExample5Server::Run()
 {
     while (CheckCurrentState(RUNNING))
     {
-        boost::this_thread::sleep(boost::posix_time::milliseconds(1000));
-
         unique_ptr<FairMQMessage> request(fTransportFactory->CreateMessage());
 
         if (fChannels.at("data").at(0).Receive(request) > 0)
diff --git a/fairmq/nanomsg/FairMQPollerNN.cxx b/fairmq/nanomsg/FairMQPollerNN.cxx
index f86870df..8bfe65eb 100644
--- a/fairmq/nanomsg/FairMQPollerNN.cxx
+++ b/fairmq/nanomsg/FairMQPollerNN.cxx
@@ -130,7 +130,7 @@ void FairMQPollerNN::Poll(int timeout)
 
 bool FairMQPollerNN::CheckInput(const int index)
 {
-    if (items[index].revents & NN_POLLIN)
+    if (items[index].revents & (NN_POLLIN | NN_POLLOUT))
     {
         return true;
     }