#40 Fix super calls