Fix watch button to inclue count