bug fix
tests