event set
bug fix