GitHub Issue 848