Fixing Evil Twin - Handshakes good only 50% of the time