Animation events handling fix