fix some mixin

to master