quick fix (could be better, but enought for now) for performance issue with watchers