Another MRO bugfix