Issues with cdi event fixed