Mixin fix