Fixed to match new _super usage