Fix the subclass