MDL:31989: Attempt to resolve errors