closing #602