issue #22067: finish returns