Fixed undoing resolution of events