Patch from CPAN #63268 applied