Issue 531

Fixes #531