added event
Fix bug