Fix crash stay in

It will have to be cherry-pick in release