Fixed the mixins