Fix a bug
Change observed event