Fix broken refactor