Issue #1028