Issue #628 fixed