Fix bug in Mixin ordering