Fix for no saved structure