Issue #1080