watching feature bugfix