Issue #1069