Solved some adding events bugs