Fixing Watcher for CommonJS