[fix] Make mixin fixing