Fix crash stay in

It will have to be cherry-pick in release
can you add comments ?

and wouldn't it better to have the same test the second day ? it should work no ?