Added fix per Rod's comment in pull request #8