Followup fix for PR #22

Forgot a few things in the prior pull request #22.