Fix events not fireing