Fix for GitHub issue #1