diff --git a/AUTHORS b/AUTHORS
index 0b7d7fc5..61b83917 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -35,6 +35,7 @@ Christian Gudrian
 Christian Kamm 
 Chuck Remes 
 Conrad D. Steenberg 
+Constantin Rack
 Dhammika Pathirana 
 Dhruva Krishnamurthy 
 Dirk O. Kaar 
diff --git a/src/pipe.cpp b/src/pipe.cpp
index 6fcf80e6..cff7b119 100644
--- a/src/pipe.cpp
+++ b/src/pipe.cpp
@@ -206,7 +206,7 @@ bool zmq::pipe_t::check_write ()
     if (unlikely (!out_active || state != active))
         return false;
 
-    bool full = hwm > 0 && msgs_written - peers_msgs_read == uint64_t (hwm);
+    bool full = !check_hwm();
 
     if (unlikely (full)) {
         out_active = false;
diff --git a/src/pipe.hpp b/src/pipe.hpp
index ae85b32c..ae45cb8e 100644
--- a/src/pipe.hpp
+++ b/src/pipe.hpp
@@ -121,7 +121,7 @@ namespace zmq
         //  in the peer.
         void hiccup ();
 
-        // Ensure the pipe wont block on receiving pipe_term.
+        //  Ensure the pipe won't block on receiving pipe_term.
         void set_nodelay ();
 
         //  Ask pipe to terminate. The termination will happen asynchronously
@@ -130,13 +130,13 @@ namespace zmq
         //  before actual shutdown.
         void terminate (bool delay_);
 
-        // set the high water marks.
+        //  Set the high water marks.
         void set_hwms (int inhwm_, int outhwm_);
 
-        // set the boost to high water marks, used by inproc sockets so total hwm are sum of connect and bind sockets watermarks
+        //  Set the boost to high water marks, used by inproc sockets so total hwm are sum of connect and bind sockets watermarks
         void set_hwms_boost(int inhwmboost_, int outhwmboost_);
 
-        // check HWM
+        //  Returns true if HWM is not reached
         bool check_hwm () const;
     private: