Issue #1084