Fixed configuration change watcher