GitHub Issue 1164