Fix bad super calls causing infinite recursion