fix some mixin