GitHub Issue 1461