corrected one more overzealous refactor