fix refactor fallout