Fixed defect in calculating OriginalEvent