oops. fixing bug from previous refactor