ZWaveJS device exclusion unresponsive Aeotec Z-Stick 5

I’ve had problems when rebuilding my server when trying to ADD or REMOVE devices. Again this is under ZWaveJS and using a Aeotec Z-Stick 5. All goes great for a while, then I’d hit START EXCLUSION and nothing happens. Server restarts or full restarts don’t help.

I found that I could fix it by pulling the Z-Stick out, placing it in exclude mode (by pressing and holding the button on it until I get the flashing orange LED) and giving the button another press (to get out of that mode). Put the stick back in the server and all’s back to normal. I’m wondering if a Z-Stick reset “mode” to default shouldn’t be issued somewhere in the code. I’m not sure where to place that in the code. Perhaps simply a timeout (when adding or removing) would be appropriate… Maybe yet another command with DEVICES - ENTITIES - ADD DEVICE - REMOVE DEVICE - HEAL NETWORK - RE-CONF… to snap the Z-Stick out of include or exclude “mode”?