Fix super method issues