Forgot a bit for #978... crash on load