Fix 588

Fixes #588