Fix determination of current event