Fixed bad refactor - oops!