diff --git a/src/peer_connection.cpp b/src/peer_connection.cpp
index 43bd4d52f..a76f45822 100755
--- a/src/peer_connection.cpp
+++ b/src/peer_connection.cpp
@@ -2635,7 +2635,10 @@ namespace libtorrent
 #ifndef NDEBUG
 	void peer_connection::check_invariant() const
 	{
-		assert((can_write() || m_connecting) == m_selector.is_writability_monitored(m_socket));
+		assert((can_write() == m_selector.is_writability_monitored(m_socket))
+			|| m_connecting);
+
+		assert(m_writability_monitored == m_selector.is_writability_monitored(m_socket));
 
 /*
 		assert(m_num_pieces == std::count(