Fix super parsing