GitHub Issue 1431