Remove event fixed