closes Issue #598