bug fix
rework