fixing the events