Issue #588 fixed