bug fix: mixin