Issue #1017