Issue #628