Fixed undefined when unwatching