GitHub Issue 1233