Fix super invocations