WATCH_EXCLUDE fixed