- bug fix: possible memory leak in Watch function