Issue #1009