Fix for Submaterial memory loss