GitHub Issue 1383