small fix
more safety