Fix for Issue #1056.. put the function back.. removed the 'shared' concept.. just added the validity pass inside the watcher