Updated eventfitter call

In discussion with @sreicher , a probable fix for the changed EventFitter interface. Please do not merge yet until further approved.