more fix
more fixes