Reworked defective events and solved issue #1