bug fix
refactor