diff --git a/fluent/sender.py b/fluent/sender.py
index 4b901a3..6762856 100644
--- a/fluent/sender.py
+++ b/fluent/sender.py
@@ -170,7 +170,7 @@ def _check_recv_side(self):
         try:
             self.socket.settimeout(0.0)
             try:
-                recvd = self.socket.recv(4096, socket.MSG_DONTWAIT)
+                recvd = self.socket.recv(4096)
             except socket.error as recv_e:
                 if recv_e.errno != errno.EWOULDBLOCK:
                     raise
diff --git a/setup.py b/setup.py
index 93fe086..80fcb59 100755
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@
 
 setup(
   name='fluent-logger',
-  version='0.9.1',
+  version='0.9.2.dev',
   description=desc,
   long_description=open(README).read(),
   package_dir={'fluent': 'fluent'},
diff --git a/tests/test_sender.py b/tests/test_sender.py
index f1f3f98..1c0fbe9 100644
--- a/tests/test_sender.py
+++ b/tests/test_sender.py
@@ -254,7 +254,7 @@ def settimeout(self, to):
                 def gettimeout(self):
                     return self.to
 
-                def recv(self, bufsize, flags):
+                def recv(self, bufsize, flags=0):
                     try:
                         v = self.recv_side_effects[self.recv_idx]
                         if isinstance(v, Exception):