GitHub Issue 1586