fix this class and super class completion