fs5 fix
refactor