be safer, cf previous commit