Issue #660 take 3