Issue #1306