[FOLD] handshakedetector to use wrapped handler