Fix the refactor