fixing MRO issues