fix for events not firiing