Merge change to fix compatibility with perl 5.8