improve evaluation quality by forcing the last finalize in more cases.