Fixed event bug