Issue #1083