Fix watch set error
wip