Fixup for PR #45, closes #47