Fix inherited classes