Fix issue where runner could hang.