bugfix on mixins