Issue #1015