Issue #1027