Partial fix for #88 and using EPrints with PERL v5.16+