[cvs-nhc98] patch applied (yhc): Previous attempt to clear event pointer was incorrect