whoops, bad refactor