Fix bug by mro2
Fix bug by bae12