Fix for GitHub issue #97