Fix to use object function events()