Added ejection fix for superclasses