GitHub Issue 1257