Fixed super calls