GitHub Issue 1211