Issue 571

fixes #571