- Try to fix watch fail hang