Fix to https://rt.cpan.org/Ticket/Display.html?id=86153. Tests next on my list.