Issue #659