GitHub Issue 1158