events and delete fix