[BUG #8541] updated addListener / fireEvent