1.5 fix event bug