Fixed a refactor that was not complete.