Fixed handshake iterface emit happening twice