Fixed watch_button