Issue #1097