Fixed this, I will push the commit soon when I get a chance to try out the client addr for the socket.

The reason I put 'n' first this time is because SSL is so slow.  But your right consistency is better.