GitHub Issue 1133