Fixed mixin code