Fix broken inheritance