Fixed entitylistener