restore old watch() functionality