Issue #1087