Issue #1145