Fix refactor.