Merge "AddEventListener fix"