Issue #1008