Fixed problems with the scope watching