If we can fix that issue with handshakeInfo I'd love that as well.