Issue #1012