Corrected last refactor.