mixin fixup