fix event fireing