fix broken super calls