Fixed watcher
Fixed argument check for monitor mode