mixin
fixed the conflict