fix watch bug