diff --git a/src/i_comm_manager.c b/src/i_comm_manager.c
index dba01b0..8081c07 100644
--- a/src/i_comm_manager.c
+++ b/src/i_comm_manager.c
@@ -65,6 +65,7 @@ TR_commManagerSelect(void * _this, TR_Event event)
 	}
 
 	TR_CALL(_this, TR_CommManager, select, event, timeout);
+	TR_eventDispatcherUpdateNextPoll(dispatcher);
 
 	return TR_EVENT_DONE;
 }
diff --git a/src/server.c b/src/server.c
index bc512e1..89238a3 100644
--- a/src/server.c
+++ b/src/server.c
@@ -43,7 +43,8 @@ serverCtor(void * _this, va_list * params)
 {
 	TR_Server this = _this;
 
-	this->comm_manager     = (TR_CommManager)TR_new(TR_CommManagerEpoll);
+	//this->comm_manager     = (TR_CommManager)TR_new(TR_CommManagerEpoll);
+	this->comm_manager     = (TR_CommManager)TR_new(TR_CommManagerPoll);
 	this->dispatcher       = TR_new(TR_EventDispatcher, TR_EVD_SERVER, NULL, 100);
 	this->connector        = TR_new(TR_Connector);
 	this->io_handler       = TR_new(TR_IoHandler);
diff --git a/testers/testclient.sh b/testers/testclient.sh
index cb54218..1f02e3b 100755
--- a/testers/testclient.sh
+++ b/testers/testclient.sh
@@ -4,7 +4,7 @@ pids=""
 i=0
 while [ $i -lt 20 ]
 do
-	dd if=/dev/zero bs=8192 count=25000 | nc -u localhost 5678 &
+	dd if=/dev/zero bs=8192 count=25000 | nc localhost 5678 &
 	pids="${pids} $!"
 	i=$((i + 1))
 done