Fix refactor