Fixes #588