Fixed a bug in watcher, wrong comparision

Removed the original interface/index when bundling