Fix Base inheritance