GitHub: Issue #1057