Issue #1134