Fix crash on updates