Fix random saving error