fixing mixin bugs