Fix for GitHub issue #30