Fixed "watch" option