Resolving rt.cpan.org bugs #92643 and #92644 as submitted by Slaven Rezic