GitHub Issue 1367