Fix missed refactor