fixing the broken events