fix extended classes