Additional PR 8882 fix.