issue #588