#651

closes #661