fix refactor issue