fix super calls from fast refactor :(