Work around bad DMCC data