fixed those mixins