update after fixing child class handling