Fix bug, now dispose events when removed