Fix bugs - redundant events.