Fixed watch button, again