Fix variable watch bug