Fix fireEvent