Fix issue #77 per discussion