Issue #1343

Fixes #1343