Fixed watcher for RPi