Issue #1019