[DF-523] Fix material load/save