Fix template watcher