corrected another overzealous refactor