bug fix
working