Fix watcher for order dependant maps