Fix events extend calls