Issue #571

Fixes #571.