some fix
some again