Attempted fix for GitHub issue #30.