Fix for GitHub issue #71