Fix bugs in internal event handling
1 file changed