Provide a putative fix for Issue #7.
Update to more recent way of doing things.