Work on duplicate event bug