re #81 fix event bug