- Fix watch return value