Fix eventcalculating