Fix for https://rt.cpan.org/Public/Bug/Display.html?id=86636
Fix for https://rt.cpan.org/Public/Bug/Display.html?id=56453