[FIX] performance issue: unnecessary&slow watchers