2.2.5 Z-Wave Repair

Updated to 2.2.5. Removed one device. Installed another device. Trying to run Z-wave Repair. Gets to "Z-Wave Repair. Stage: Mapping Network Refreshing Node Status". After 15 minutes, no change. "Abort" button not working.

I have that issue with my C-7 running When this happens I simply reboot my hub and then I can successfully run a Z-wave Repair.