Issue #1013