Fix mixin inheritance issue