Fix MRO issues and avoid regression at the same time.