Better handling of zero-duration events