Issue #1099