fix mixin