changed behavior of event-calculation