Issue #660 take 2