This fixes the problems described in issue #11, but is not a solution
that anyone should invite home to dinner.  See issue #15 for details.