GitHub Issue 1165