event bug fix