Fixed missed refactor