Fix watcher for xidx, yidx