Fixed #17235 -- Updated mis specifying class on super