Fix method resolution order for modified classes

- [x] swap base class order