fix extend mixin