Fix events delegation