#594

closes #594