Fix refactor error