Fixed super() usage