Fixed addEvents......