fixed eventlistener