fixed event watcher yay!