Finish and fix the events