doh -- fixed bad refactor