closes #602