Attempt to address issue #26 and perl bug RT 115742.