GitHub Issue 1636