Fix for GitHub Issue #9