Fixing calls to super