Fixed adding and removing off watchable thread.