GitHub Issue 1700