Fix subclass