fix issue
refactor