Issue #1094