Fixed refactor issue