GitHub: Issue #812