Partially fix Issue #8