GitHub Issue 1384