Added workaround to allow the DAOs to save data.