Issue 589

Fixes #589