Bug fixed and added event.