Fix events return